Fixing Typos and spelling mistakes in messages

Suggestions by Yaniv Kaul <ykaul@redhat.com>
https://bugzilla.redhat.com/show_bug.cgi?id=888744
This commit is contained in:
Derek Higgins 2012-12-20 07:06:06 -05:00
parent ceb2af5697
commit a3d3cd54e7
15 changed files with 71 additions and 71 deletions

View File

@ -1,5 +1,5 @@
==============
packstack
==============
Packstack
==============
SYNOPSIS
@ -9,17 +9,17 @@ SYNOPSIS
DESCRIPTION
===========
Packstack is a utility that uses uses puppet modules to install openstack. It can be used to install each openstack service on seperate servers, all on one server or any combination of these. There are 3 ways that packstack can be run.
Packstack is a utility that uses uses puppet modules to install OpenStack. It can be used to install each openstack service on separate servers, all on one server or any combination of these. There are 3 ways that Packstack can be run.
- packstack
- packstack [options]
- packstack --gen-answer-file=<file> / packstack --answer-file=<file>
The third of these options allows the user to generate a default answer file, edit the default options and finally run packstack a second time using this answerfile, this is the easyies way to run packstack and the one that will be documented here. When <file> is created the OPTIONS below will be contained and can be edited by the user.
The third option allows the user to generate a default answer file, edit the default options and finally run Packstack a second time using this answer file. This is the easiest way to run Packstack and the one that will be documented here. When <file> is created the OPTIONS below will be contained and can be edited by the user.
OPTIONS
=======
Installer Config paramaters
Installer Config parameters
---------------------------
**CONFIG_DEBUG** : Should we turn on debug in logging ['y', 'n']
@ -27,24 +27,24 @@ Installer Config paramaters
SSH Configs
------------
**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
**CONFIG_SSH_KEY** : Path to a Public key to install on servers. If a usable key has not been installed on the 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_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_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_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_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_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']
**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
MySQL Config parameters
-----------------------
**CONFIG_MYSQL_HOST** : The IP address of the server on which to install MySQL
@ -53,26 +53,26 @@ MySQL Config paramaters
**CONFIG_MYSQL_PW** : Password for the MySQL admin user
QPID Config paramaters
QPID Config parameters
----------------------
**CONFIG_QPID_HOST** : The IP address of the server on which to install the QPID service
Keystone Config paramaters
Keystone Config parameters
--------------------------
**CONFIG_KEYSTONE_HOST** : The IP address of the server on which to install Keystone
**CONFIG_KEYSTONE_ADMINTOKEN** : The token to use for the keystone service api
**CONFIG_KEYSTONE_ADMINTOKEN** : The token to use for the Keystone service api
**CONFIG_KEYSTONE_ADMINPASSWD** : The password to use for the keystone admin user
**CONFIG_KEYSTONE_ADMINPASSWD** : The password to use for the Keystone admin user
Glance Config paramaters
Glance Config parameters
------------------------
**CONFIG_GLANCE_HOST** : The IP address of the server on which to install Glance
Cinder Config paramaters
Cinder Config parameters
------------------------
**CONFIG_CINDER_HOST** : The IP address of the server on which to install Cinder
@ -86,7 +86,7 @@ Nova Options
**CONFIG_NOVA_VNCPROXY_HOST** : The IP address of the server on which to install the Nova VNC proxy
**CONFIG_NOVA_COMPUTE_HOSTS** : A comma seperated list of IP addresses on which to install the Nova Compute services
**CONFIG_NOVA_COMPUTE_HOSTS** : A comma separated 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
@ -102,41 +102,41 @@ Nova Options
**CONFIG_NOVA_SCHED_HOST** : The IP address of the server on which to install the Nova Scheduler service
NOVACLIENT Config paramaters
NOVACLIENT Config parameters
----------------------------
**CONFIG_OSCLIENT_HOST** : The IP address of the server on which to install the openstack client packages, an admin "rc" file will also be installed
**CONFIG_OSCLIENT_HOST** : The IP address of the server on which to install the openstack client packages. An admin "rc" file will also be installed
OpenStack Horizon Config paramaters
OpenStack Horizon Config parameters
-----------------------------------
**CONFIG_HORIZON_HOST** : The IP address of the server on which to install Horizon
**CONFIG_HORIZON_SECRET_KEY** : Horizon Secret Encryption Key
OpenStack Swift Config paramaters
OpenStack Swift Config parameters
---------------------------------
**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 <ipaddress>[/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_HOSTS** : A comma separated list of IP addresses on which to install the Swift Storage services, each entry should take the format <ipaddress>[/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 omitted 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 configured
**CONFIG_SWIFT_STORAGE_ZONES** : Number of swift storage zones, this number MUST be no bigger than the 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 configured
**CONFIG_SWIFT_STORAGE_REPLICAS** : Number of swift storage replicas, this number MUST be no bigger than the 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 "y" EPEL will be installed on each server ['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_REPO** : A comma separated 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_USERNAME** : To subscribe each server with Red Hat 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
**CONFIG_RH_PASSWORD** : To subscribe each server with Red Hat subscription manager, include this with CONFIG_RH_USERNAME
SOURCE

View File

@ -121,7 +121,7 @@ def initConfig():
"""
conf_groups = (
{ "GROUP_NAME" : "INSTALLER",
"DESCRIPTION" : "Installer Config paramaters",
"DESCRIPTION" : "Installer Config parameters",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,

View File

@ -43,7 +43,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "CINDER",
"DESCRIPTION" : "Cinder Config paramaters",
"DESCRIPTION" : "Cinder Config parameters",
"PRE_CONDITION" : "CONFIG_CINDER_INSTALL",
"PRE_CONDITION_MATCH" : "y",
"POST_CONDITION" : False,

View File

@ -56,7 +56,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "OSHORIZON",
"DESCRIPTION" : "OpenStack Horizon Config paramaters",
"DESCRIPTION" : "OpenStack Horizon Config parameters",
"PRE_CONDITION" : "CONFIG_HORIZON_INSTALL",
"PRE_CONDITION_MATCH" : "y",
"POST_CONDITION" : False,

View File

@ -43,7 +43,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "GLANCE",
"DESCRIPTION" : "Glance Config paramaters",
"DESCRIPTION" : "Glance Config parameters",
"PRE_CONDITION" : "CONFIG_GLANCE_INSTALL",
"PRE_CONDITION_MATCH" : "y",
"POST_CONDITION" : False,

View File

@ -21,8 +21,8 @@ def initConfig(controllerObject):
paramsList = [
{"CMD_OPTION" : "os-glance-install",
"USAGE" : "Set to 'y' if you would like packstack to install Glance",
"PROMPT" : "Should packstack 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" : "Set to 'y' if you would like packstack to install Cinder",
"PROMPT" : "Should packstack 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" : "Set to 'y' if you would like packstack to install Nova",
"PROMPT" : "Should packstack 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" : "Set to 'y' if you would like packstack to install Horizon",
"PROMPT" : "Should packstack 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" : "Set to 'y' if you would like packstack to install swift",
"PROMPT" : "Should packstack 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" : "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",
"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",

View File

@ -43,8 +43,8 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "keystone-admin-token",
"USAGE" : "The token to use for the keystone service api",
"PROMPT" : "The token to use for the keystone service api",
"USAGE" : "The token to use for the Keystone service api",
"PROMPT" : "The token to use for the Keystone service api",
"OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validateStringNotEmpty,
"DEFAULT_VALUE" : uuid.uuid4().hex,
@ -55,8 +55,8 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "keystone-admin-passwd",
"USAGE" : "The password to use for the keystone admin user",
"PROMPT" : "Enter the password 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],
@ -69,7 +69,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "KEYSTONE",
"DESCRIPTION" : "Keystone Config paramaters",
"DESCRIPTION" : "Keystone Config parameters",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,

View File

@ -68,7 +68,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "MYSQL",
"DESCRIPTION" : "MySQL Config paramaters",
"DESCRIPTION" : "MySQL Config parameters",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,

View File

@ -69,8 +69,8 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "novacompute-hosts",
"USAGE" : "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",
"USAGE" : "A comma separated list of IP addresses on which to install the Nova Compute services",
"PROMPT" : "Enter a comma separated list of IP addresses on which to install the Nova Compute services",
"OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validateMultiSSH,
"DEFAULT_VALUE" : "127.0.0.1",

View File

@ -26,7 +26,7 @@ def initConfig(controllerObject):
logging.debug("Adding Openstack client configuration")
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",
"USAGE" : "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,
@ -43,7 +43,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "NOVACLIENT",
"DESCRIPTION" : "NOVACLIENT Config paramaters",
"DESCRIPTION" : "NOVACLIENT Config parameters",
"PRE_CONDITION" : "CONFIG_CLIENT_INSTALL",
"PRE_CONDITION_MATCH" : "y",
"POST_CONDITION" : False,

View File

@ -34,7 +34,7 @@ def initConfig(controllerObject):
]
groupDict = {"GROUP_NAME" : "PUPPET",
"DESCRIPTION" : "Puppet Config paramaters",
"DESCRIPTION" : "Puppet Config parameters",
"PRE_CONDITION" : utils.returnYes,
"PRE_CONDITION_MATCH" : "yes",
"POST_CONDITION" : False,

View File

@ -43,7 +43,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "QPIDLANCE",
"DESCRIPTION" : "QPID Config paramaters",
"DESCRIPTION" : "QPID Config parameters",
"PRE_CONDITION" : "CONFIG_NOVA_INSTALL",
"PRE_CONDITION_MATCH" : "y",
"POST_CONDITION" : False,

View File

@ -25,7 +25,7 @@ def initConfig(controllerObject):
logging.debug("Adding SERVERPREPARE KEY configuration")
conf_params = {"SERVERPREPARE": [
{"CMD_OPTION" : "use-epel",
"USAGE" : "Install openstack from epel, If set to \"y\" EPEL will be installed on each server",
"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,
@ -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 yum repositories to install",
"PROMPT" : "Enter a comma seperated list of urls to any additional yum repositories to install",
"USAGE" : "A comma separated list of URLs to any additional yum repositories to install",
"PROMPT" : "Enter a comma separated list of URLs to any additional yum repositories to install",
"OPTION_LIST" : [],
"VALIDATION_FUNC" : lambda a,b: True,
"DEFAULT_VALUE" : "",
@ -49,7 +49,7 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "rh-username",
"USAGE" : "To subscribe each server with redhat subscription manager, include this with CONFIG_RH_PASSWORD",
"USAGE" : "To subscribe each server with Red Hat 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,
@ -61,7 +61,7 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"CONDITION" : False },
{"CMD_OPTION" : "rh-password",
"USAGE" : "To subscribe each server with redhat subscription manager, include this with CONFIG_RH_USERNAME",
"USAGE" : "To subscribe each server with Red Hat 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,

View File

@ -27,7 +27,7 @@ def initConfig(controllerObject):
logging.debug("Adding SSH KEY configuration")
paramsList = [
{"CMD_OPTION" : "ssh-public-key",
"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",
"USAGE" : "Path to a Public key to install on servers. If a usable key has not been installed on the 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,

View File

@ -39,7 +39,7 @@ def initConfig(controllerObject):
"NEED_CONFIRM" : False,
"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 <ipaddress>[/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",
"USAGE" : "A comma separated list of IP addresses on which to install the Swift Storage services, each entry should take the format <ipaddress>[/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 omitted Packstack will create a loopback device for a test setup",
"PROMPT" : "Enter the Swift Storage servers e.g. host/dev,host/dev",
"OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validateStringNotEmpty,
@ -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 configured",
"PROMPT" : "Enter the number of swift storage zones, MUST be no bigger then number of storage devices configured",
"USAGE" : "Number of swift storage zones, this number MUST be no bigger than the number of storage devices configured",
"PROMPT" : "Enter the number of swift storage zones, MUST be no bigger than the 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 configured",
"PROMPT" : "Enter the number of swift storage replicas, MUST be no bigger then number of storage zones configured",
"USAGE" : "Number of swift storage replicas, this number MUST be no bigger than the number of storage zones configured",
"PROMPT" : "Enter the number of swift storage replicas, MUST be no bigger than the number of storage zones configured",
"OPTION_LIST" : [],
"VALIDATION_FUNC" : validate.validateInteger,
"DEFAULT_VALUE" : "1",
@ -89,7 +89,7 @@ def initConfig(controllerObject):
]
groupDict = { "GROUP_NAME" : "OSSWIFT",
"DESCRIPTION" : "OpenStack Swift Config paramaters",
"DESCRIPTION" : "OpenStack Swift Config parameters",
"PRE_CONDITION" : "CONFIG_SWIFT_INSTALL",
"PRE_CONDITION_MATCH" : "y",
"POST_CONDITION" : False,