diff --git a/docs/packstack.rst b/docs/packstack.rst index ad337b5bb..bc1424631 100644 --- a/docs/packstack.rst +++ b/docs/packstack.rst @@ -19,32 +19,37 @@ DESCRIPTION OPTIONS ======= -Global Options --------------- +Installer Config paramaters +--------------------------- -**CONFIG_GLANCE_INSTALL** : Selects if packstack does or does not install Glance ['y', 'n'] - -**CONFIG_CINDER_INSTALL** : Selects if packstack does or does not install Cinder ['y', 'n'] - -**CONFIG_NOVA_INSTALL** : Selects if packstack does or does not install Nova ['y', 'n'] - -**CONFIG_HORIZON_INSTALL** : Selects if packstack does or does not install Horizon ['y', 'n'] - -**CONFIG_SWIFT_INSTALL** : Selects if packstack does or does not install swift ['y', 'n'] - -**CONFIG_CLIENT_INSTALL** : Selects if packstack does or does not install the openstack client packages, a admin "rc" file will also be installed ['y', 'n'] +**CONFIG_DEBUG** : Should we turn on debug in logging ['y', 'n'] SSH Configs ------------ -**CONFIG_SSH_KEY** : Public key to install on servers, if a usable key has not been installed on remote servers the user will be prompted for a password and this key will be installed so the password will not be required again ['/home/derekh/.ssh/id_rsa.pub'] +**CONFIG_SSH_KEY** : Path to a Public key to install on servers, if a usable key has not been installed on remote servers the user will be prompted for a password and this key will be installed so the password will not be required again + +Global Options +-------------- + +**CONFIG_GLANCE_INSTALL** : Set to 'y' if you would like packstack to install Glance ['y', 'n'] + +**CONFIG_CINDER_INSTALL** : Set to 'y' if you would like packstack to install Cinder ['y', 'n'] + +**CONFIG_NOVA_INSTALL** : Set to 'y' if you would like packstack to install Nova ['y', 'n'] + +**CONFIG_HORIZON_INSTALL** : Set to 'y' if you would like packstack to install Horizon ['y', 'n'] + +**CONFIG_SWIFT_INSTALL** : Set to 'y' if you would like packstack to install swift ['y', 'n'] + +**CONFIG_CLIENT_INSTALL** : Set to 'y' if you would like packstack to install the openstack client packages, an admin "rc" file will also be installed ['y', 'n'] MySQL Config paramaters ----------------------- **CONFIG_MYSQL_HOST** : The IP address of the server on which to install MySQL -**CONFIG_MYSQL_USER** : Username of the MySQL admin user +**CONFIG_MYSQL_USER** : Username for the MySQL admin user **CONFIG_MYSQL_PW** : Password for the MySQL admin user @@ -60,7 +65,7 @@ Keystone Config paramaters **CONFIG_KEYSTONE_ADMINTOKEN** : The token to use for the keystone service api -**CONFIG_KEYSTONE_ADMINPASSWD** : The token password to use for the keystone admin user +**CONFIG_KEYSTONE_ADMINPASSWD** : The password to use for the keystone admin user Glance Config paramaters ------------------------ @@ -79,9 +84,9 @@ Nova Options **CONFIG_NOVA_CERT_HOST** : The IP address of the server on which to install the Nova Cert service -**CONFIG_NOVA_COMPUTE_HOSTS** : A comma seperated list of IP addresses on which to install the Nova Compute services +**CONFIG_NOVA_VNCPROXY_HOST** : The IP address of the server on which to install the Nova VNC proxy -**CONFIG_LIBVIRT_TYPE** : The libvirt type to use, if your compute server is bare metal set to kvm, if testing on a vm set to qemu ['qemu', 'kvm'] +**CONFIG_NOVA_COMPUTE_HOSTS** : A comma seperated list of IP addresses on which to install the Nova Compute services **CONFIG_NOVA_COMPUTE_PRIVIF** : Private interface for Flat DHCP on the Nova compute servers @@ -107,25 +112,31 @@ OpenStack Horizon Config paramaters **CONFIG_HORIZON_HOST** : The IP address of the server on which to install Horizon -**CONFIG_HORIZON_SECRET_KEY** : Keystone Secret Encryption Key +**CONFIG_HORIZON_SECRET_KEY** : Horizon Secret Encryption Key OpenStack Swift Config paramaters --------------------------------- -**CONFIG_SWIFT_PROXY_HOSTS** : A comma seperated list of IP addresses on which to install the Swift proxy services +**CONFIG_SWIFT_PROXY_HOSTS** : The IP address on which to install the Swift proxy service **CONFIG_SWIFT_STORAGE_HOSTS** : A comma seperated list of IP addresses on which to install the Swift Storage services, each entry should take the format [/dev], for example 127.0.0.1/vdb will install /dev/vdb on 127.0.0.1 as a swift storage device, if /dev is ommited packstack will create a loopback device for a test setup -**CONFIG_SWIFT_STORAGE_ZONES** : Number of swift storage zones, this number MUST be no bigger then number of storage devices configered +**CONFIG_SWIFT_STORAGE_ZONES** : Number of swift storage zones, this number MUST be no bigger then number of storage devices configured -**CONFIG_SWIFT_STORAGE_REPLICAS** : Number of swift storage replicas, this number MUST be no bigger then number of storage zones configered +**CONFIG_SWIFT_STORAGE_REPLICAS** : Number of swift storage replicas, this number MUST be no bigger then number of storage zones configured **CONFIG_SWIFT_STORAGE_FSTYPE** : FileSystem type for storage nodes ['xfs', 'ext4'] Server Prepare Configs ----------------------- -**CONFIG_USE_EPEL** : Install openstack from epel, If set to "n" this causes EPEL to be permanently disabled before installing openstack, i.e. you should have alternative openstack repositories in place ['y', 'n'] +**CONFIG_USE_EPEL** : Install openstack from epel, If set to "y" EPEL will be installed on each server ['y', 'n'] + +**CONFIG_REPO** : A comma seperated list of urls to any additional yum repositories to install + +**CONFIG_RH_USERNAME** : To subscribe each server with redhat subscription manager, include this with CONFIG_RH_PASSWORD + +**CONFIG_RH_PASSWORD** : To subscribe each server with redhat subscription manager, include this with CONFIG_RH_USERNAME SOURCE diff --git a/packstack/plugins/cinder_250.py b/packstack/plugins/cinder_250.py index 9e064ab21..8bfaf2b1e 100644 --- a/packstack/plugins/cinder_250.py +++ b/packstack/plugins/cinder_250.py @@ -27,7 +27,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "cinder-host", "USAGE" : "The IP address of the server on which to install Cinder", - "PROMPT" : "The IP address of the server on which to install Cinder", + "PROMPT" : "Enter the IP address of the Cinder server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", diff --git a/packstack/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py index 5dca46bc3..062334768 100644 --- a/packstack/plugins/dashboard_500.py +++ b/packstack/plugins/dashboard_500.py @@ -28,7 +28,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "os-horizon-host", "USAGE" : "The IP address of the server on which to install Horizon", - "PROMPT" : "The IP address of the server on which to install Horizon", + "PROMPT" : "Enter the IP address of the Horizon server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -42,8 +42,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-horizon-secretkey", - "USAGE" : "Keystone Secret Encryption Key", - "PROMPT" : "Keystone Secret Encryption Key", + "USAGE" : "Horizon Secret Encryption Key", + "PROMPT" : "Horizon Secret Encryption Key", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : uuid.uuid4().hex, diff --git a/packstack/plugins/glance_200.py b/packstack/plugins/glance_200.py index af15a8f0a..182e4a425 100644 --- a/packstack/plugins/glance_200.py +++ b/packstack/plugins/glance_200.py @@ -27,7 +27,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "glance-host", "USAGE" : "The IP address of the server on which to install Glance", - "PROMPT" : "The IP address of the server on which to install Glance", + "PROMPT" : "Enter the IP address of the Glance server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", diff --git a/packstack/plugins/global_000.py b/packstack/plugins/global_000.py index f6fdcf7a5..39ca6473e 100644 --- a/packstack/plugins/global_000.py +++ b/packstack/plugins/global_000.py @@ -21,8 +21,8 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "os-glance-install", - "USAGE" : "Selects if packstack does or does not install Glance", - "PROMPT" : "Selects if packstack does or does not install Glance", + "USAGE" : "Set to 'y' if you would like packstack to install Glance", + "PROMPT" : "Should packstack install Glance", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "y", @@ -33,8 +33,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-cinder-install", - "USAGE" : "Selects if packstack does or does not install Cinder", - "PROMPT" : "Selects if packstack does or does not install Cinder", + "USAGE" : "Set to 'y' if you would like packstack to install Cinder", + "PROMPT" : "Should packstack install Cinder", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "y", @@ -45,8 +45,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-nova-install", - "USAGE" : "Selects if packstack does or does not install Nova", - "PROMPT" : "Selects if packstack does or does not install Nova", + "USAGE" : "Set to 'y' if you would like packstack to install Nova", + "PROMPT" : "Should packstack install Nova", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "y", @@ -57,8 +57,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-horizon-install", - "USAGE" : "Selects if packstack does or does not install Horizon", - "PROMPT" : "Selects if packstack does or does not install Horizon", + "USAGE" : "Set to 'y' if you would like packstack to install Horizon", + "PROMPT" : "Should packstack install Horizon", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "y", @@ -69,8 +69,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-swift-install", - "USAGE" : "Selects if packstack does or does not install swift", - "PROMPT" : "Selects if packstack does or does not install swift", + "USAGE" : "Set to 'y' if you would like packstack to install swift", + "PROMPT" : "Should packstack install swift", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "n", @@ -81,8 +81,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-client-install", - "USAGE" : "Selects if packstack does or does not install the openstack client packages, a admin \"rc\" file will also be installed", - "PROMPT" : "Selects if packstack does or does not install the openstack client packages, a admin \"rc\" file will also be installed", + "USAGE" : "Set to 'y' if you would like packstack to install the openstack client packages, an admin \"rc\" file will also be installed", + "PROMPT" : "Should packstack install openstack client tools", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "y", diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index 4001ab93b..37336d4a6 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -29,7 +29,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "keystone-host", "USAGE" : "The IP address of the server on which to install Keystone", - "PROMPT" : "The IP address of the server on which to install Keystone", + "PROMPT" : "Enter the IP address of the Keystone server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -55,8 +55,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "keystone-admin-passwd", - "USAGE" : "The token password to use for the keystone admin user", - "PROMPT" : "The token password to use for the keystone admin user", + "USAGE" : "The password to use for the keystone admin user", + "PROMPT" : "Enter the password for the keystone admin user", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : uuid.uuid4().hex[:6], diff --git a/packstack/plugins/mysql_001.py b/packstack/plugins/mysql_001.py index 6b39b6937..faccfd9f0 100644 --- a/packstack/plugins/mysql_001.py +++ b/packstack/plugins/mysql_001.py @@ -28,7 +28,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "mysql-host", "USAGE" : "The IP address of the server on which to install MySQL", - "PROMPT" : "The IP address of the server on which to install MySQL", + "PROMPT" : "Enter the IP address of the MySQL server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -42,8 +42,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "mysql-user", - "USAGE" : "Username of the MySQL admin user", - "PROMPT" : "Username of the MySQL admin user", + "USAGE" : "Username for the MySQL admin user", + "PROMPT" : "Enter the username for the MySQL admin user", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : "root", @@ -55,7 +55,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "mysql-pw", "USAGE" : "Password for the MySQL admin user", - "PROMPT" : "Password for the MySQL admin user", + "PROMPT" : "Enter the password for the MySQL admin user", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : uuid.uuid4().hex[:6], diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py index dfb94fd88..2b42cde12 100644 --- a/packstack/plugins/nova_300.py +++ b/packstack/plugins/nova_300.py @@ -25,7 +25,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "novaapi-host", "USAGE" : "The IP address of the server on which to install the Nova API service", - "PROMPT" : "The IP address of the server on which to install the Nova API service", + "PROMPT" : "Enter the IP address of the Nova API service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -40,7 +40,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novacert-host", "USAGE" : "The IP address of the server on which to install the Nova Cert service", - "PROMPT" : "The IP address of the server on which to install the Nova Cert service", + "PROMPT" : "Enter the IP address of the Nova Cert service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -55,7 +55,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novavncproxy-hosts", "USAGE" : "The IP address of the server on which to install the Nova VNC proxy", - "PROMPT" : "The IP address of the server on which to install the Nova VNC proxy", + "PROMPT" : "Enter the IP address of the Nova VNC proxy", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -70,7 +70,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novacompute-hosts", "USAGE" : "A comma seperated list of IP addresses on which to install the Nova Compute services", - "PROMPT" : "A comma seperated list of IP addresses on which to install the Nova Compute services", + "PROMPT" : "Enter a comma seperated list of IP addresses on which to install the Nova Compute services", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateMultiSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -82,7 +82,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novacompute-privif", "USAGE" : "Private interface for Flat DHCP on the Nova compute servers", - "PROMPT" : "Private interface for Flat DHCP on the Nova compute servers", + "PROMPT" : "Enter the Private interface for Flat DHCP on the Nova compute servers", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : "eth1", @@ -94,7 +94,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novanetwork-host", "USAGE" : "The IP address of the server on which to install the Nova Network service", - "PROMPT" : "The IP address of the server on which to install the Nova Network service", + "PROMPT" : "Enter the IP address of the Nova Network service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -109,7 +109,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novanetwork-pubif", "USAGE" : "Public interface on the Nova network server", - "PROMPT" : "Public interface on the Nova network server", + "PROMPT" : "Enter the Public interface on the Nova network server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : "eth0", @@ -121,7 +121,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novanetwork-privif", "USAGE" : "Private interface for Flat DHCP on the Nova network server", - "PROMPT" : "Private interface for Flat DHCP on the Nova network server", + "PROMPT" : "Enter the Private interface for Flat DHCP on the Nova network server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : "eth1", @@ -133,7 +133,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novanetwork-fixed-range", "USAGE" : "IP Range for Flat DHCP", - "PROMPT" : "IP Range for Flat DHCP", + "PROMPT" : "Enter the IP Range for Flat DHCP", "OPTION_LIST" : ["^([\d]{1,3}\.){3}[\d]{1,3}/\d\d?$"], "VALIDATION_FUNC" : validate.validateRe, "DEFAULT_VALUE" : "192.168.32.0/22", @@ -145,7 +145,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novanetwork-floating-range", "USAGE" : "IP Range for Floating IP's", - "PROMPT" : "IP Range for Floating IP's", + "PROMPT" : "Enter the IP Range for Floating IP's", "OPTION_LIST" : ["^([\d]{1,3}\.){3}[\d]{1,3}/\d\d?$"], "VALIDATION_FUNC" : validate.validateRe, "DEFAULT_VALUE" : "10.3.4.0/22", @@ -157,7 +157,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "novasched-host", "USAGE" : "The IP address of the server on which to install the Nova Scheduler service", - "PROMPT" : "The IP address of the server on which to install the Nova Scheduler service", + "PROMPT" : "Enter the IP address of the Nova Scheduler service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", diff --git a/packstack/plugins/openstack_client_400.py b/packstack/plugins/openstack_client_400.py index 738acd48b..a8d150640 100644 --- a/packstack/plugins/openstack_client_400.py +++ b/packstack/plugins/openstack_client_400.py @@ -27,7 +27,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "osclient-host", "USAGE" : "The IP address of the server on which to install the openstack client packages, an admin \"rc\" file will also be installed", - "PROMPT" : "The IP address of the server on which to install the openstack client packages, an admin \"rc\" file will also be installed", + "PROMPT" : "Enter the IP address of the client server", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", diff --git a/packstack/plugins/qpid_002.py b/packstack/plugins/qpid_002.py index afb0a4b54..8d2e63f33 100644 --- a/packstack/plugins/qpid_002.py +++ b/packstack/plugins/qpid_002.py @@ -27,7 +27,7 @@ def initConfig(controllerObject): paramsList = [ {"CMD_OPTION" : "qpid-host", "USAGE" : "The IP address of the server on which to install the QPID service", - "PROMPT" : "The IP address of the server on which to install the QPID service", + "PROMPT" : "Enter the IP address of the QPID service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", diff --git a/packstack/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py index 1b63d264f..ddb113e69 100644 --- a/packstack/plugins/serverprep_901.py +++ b/packstack/plugins/serverprep_901.py @@ -25,8 +25,8 @@ def initConfig(controllerObject): logging.debug("Adding SERVERPREPARE KEY configuration") conf_params = {"SERVERPREPARE": [ {"CMD_OPTION" : "use-epel", - "USAGE" : "Install openstack from epel, If set to \"n\" this causes EPEL to be permanently disabled before installing openstack, i.e. you should have alternative openstack repositories in place", - "PROMPT" : "Install openstack from epel, If set to \"n\" this causes EPEL to be permanently disabled before installing openstack, i.e. you should have alternative openstack repositories in place", + "USAGE" : "Install openstack from epel, If set to \"y\" EPEL will be installed on each server", + "PROMPT" : "Should packstack install EPEL on each server", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "n", @@ -37,8 +37,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "additional-repo", - "USAGE" : "A comma seperated list of urls to any additional repositories to install", - "PROMPT" : "A comma seperated list of urls to any additional repositories to install", + "USAGE" : "A comma seperated list of urls to any additional yum repositories to install", + "PROMPT" : "Enter a comma seperated list of urls to any additional yum repositories to install", "OPTION_LIST" : [], "VALIDATION_FUNC" : lambda a,b: True, "DEFAULT_VALUE" : "", @@ -49,8 +49,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "rh-username", - "USAGE" : "To subscribe each server to Red Hat, include this with CONFIG_RH_PASSWORD", - "PROMPT" : "To subscribe each server to Red Hat, include this with CONFIG_RH_PASSWORD", + "USAGE" : "To subscribe each server with redhat subscription manager, include this with CONFIG_RH_PASSWORD", + "PROMPT" : "To subscribe each server to Red Hat enter a username here", "OPTION_LIST" : [], "VALIDATION_FUNC" : lambda a,b: True, "DEFAULT_VALUE" : "", @@ -61,8 +61,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "rh-password", - "USAGE" : "To subscribe each server to Red Hat, include this with CONFIG_RH_USERNAME", - "PROMPT" : "To subscribe each server to Red Hat, include this with CONFIG_RH_USERNAME", + "USAGE" : "To subscribe each server with redhat subscription manager, include this with CONFIG_RH_USERNAME", + "PROMPT" : "To subscribe each server to Red Hat enter your password here", "OPTION_LIST" : [], "VALIDATION_FUNC" : lambda a,b: True, "DEFAULT_VALUE" : "", diff --git a/packstack/plugins/sshkeys_000.py b/packstack/plugins/sshkeys_000.py index 0ae7bd65f..597a7c672 100644 --- a/packstack/plugins/sshkeys_000.py +++ b/packstack/plugins/sshkeys_000.py @@ -27,9 +27,9 @@ def initConfig(controllerObject): logging.debug("Adding SSH KEY configuration") paramsList = [ {"CMD_OPTION" : "ssh-public-key", - "USAGE" : "Public key to install on servers, if a usable key has not been installed on remote servers the user will be prompted for a password and this key will be installed so the password will not be required again", - "PROMPT" : "Public key to install on servers, if a usable key has not been installed on remote servers the user will be prompted for a password and this key will be installed so the password will not be required again", - "OPTION_LIST" : glob.glob(os.path.join(os.environ["HOME"], ".ssh/*.pub")), + "USAGE" : "Path to a Public key to install on servers, if a usable key has not been installed on remote servers the user will be prompted for a password and this key will be installed so the password will not be required again", + "PROMPT" : "Enter the path to your ssh Public key to install on servers", + "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateFile, "DEFAULT_VALUE" : (glob.glob(os.path.join(os.environ["HOME"], ".ssh/*.pub"))+[""])[0], "MASK_INPUT" : False, diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py index 5ce746fa3..f29b523cc 100644 --- a/packstack/plugins/swift_600.py +++ b/packstack/plugins/swift_600.py @@ -27,8 +27,8 @@ def initConfig(controllerObject): logging.debug("Adding Openstack swift configuration") paramsList = [ {"CMD_OPTION" : "os-swift-proxy", - "USAGE" : "A comma seperated list of IP addresses on which to install the Swift proxy services", - "PROMPT" : "A comma seperated list of IP addresses on which to install the Swift proxy services", + "USAGE" : "The IP address on which to install the Swift proxy service", + "PROMPT" : "Enter the IP address of the Swift proxy service", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateSSH, "DEFAULT_VALUE" : "127.0.0.1", @@ -40,7 +40,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "os-swift-storage", "USAGE" : "A comma seperated list of IP addresses on which to install the Swift Storage services, each entry should take the format [/dev], for example 127.0.0.1/vdb will install /dev/vdb on 127.0.0.1 as a swift storage device, if /dev is ommited packstack will create a loopback device for a test setup", - "PROMPT" : "Hostname of the Swift Storage servers e.g. host/dev,host/dev", + "PROMPT" : "Enter the Swift Storage servers e.g. host/dev,host/dev", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateStringNotEmpty, "DEFAULT_VALUE" : "127.0.0.1", @@ -51,8 +51,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-swift-storage-zones", - "USAGE" : "Number of swift storage zones, this number MUST be no bigger then number of storage devices configered", - "PROMPT" : "Number of swift storage zones, this number MUST be no bigger then number of storage devices configered", + "USAGE" : "Number of swift storage zones, this number MUST be no bigger then number of storage devices configured", + "PROMPT" : "Enter the number of swift storage zones, MUST be no bigger then number of storage devices configured", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateInteger, "DEFAULT_VALUE" : "1", @@ -63,8 +63,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "os-swift-storage-replicas", - "USAGE" : "Number of swift storage replicas, this number MUST be no bigger then number of storage zones configered", - "PROMPT" : "Number of swift storage replicas, this number MUST be no bigger then number of storage zones configered", + "USAGE" : "Number of swift storage replicas, this number MUST be no bigger then number of storage zones configured", + "PROMPT" : "Enter the number of swift storage replicas, MUST be no bigger then number of storage zones configured", "OPTION_LIST" : [], "VALIDATION_FUNC" : validate.validateInteger, "DEFAULT_VALUE" : "1", @@ -76,7 +76,7 @@ def initConfig(controllerObject): "CONDITION" : False }, {"CMD_OPTION" : "os-swift-storage-fstype", "USAGE" : "FileSystem type for storage nodes", - "PROMPT" : "FileSystem type for storage nodes", + "PROMPT" : "Enter FileSystem type for storage nodes", "OPTION_LIST" : ['xfs','ext4'], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "ext4",