diff --git a/packstack/plugins/cinder_250.py b/packstack/plugins/cinder_250.py index 67265da14..cc88313fc 100644 --- a/packstack/plugins/cinder_250.py +++ b/packstack/plugins/cinder_250.py @@ -28,7 +28,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack Cinder configuration") + logging.debug("Adding OpenStack Cinder configuration") paramsList = [ {"CMD_OPTION" : "cinder-host", "USAGE" : "The IP address of the server on which to install Cinder", @@ -134,11 +134,11 @@ def initSequences(controller): return cindersteps = [ - {'title': 'Adding Cinder Keystone Manifest entries', 'functions':[createkeystonemanifest]}, + {'title': 'Adding Cinder Keystone manifest entries', 'functions':[createkeystonemanifest]}, {'title': 'Checking if the Cinder server has a cinder-volumes vg', 'functions':[checkcindervg]}, - {'title': 'Creating Cinder Manifest', 'functions':[createmanifest]} + {'title': 'Adding Cinder manifest entries', 'functions':[createmanifest]} ] - controller.addSequence("Installing Cinder", [], [], cindersteps) + controller.addSequence("Installing OpenStack Cinder", [], [], cindersteps) def createVolume(param, options=[]): diff --git a/packstack/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py index dd955186c..fd6d38b89 100644 --- a/packstack/plugins/dashboard_500.py +++ b/packstack/plugins/dashboard_500.py @@ -1,5 +1,5 @@ """ -Installs and configures an openstack horizon +Installs and configures OpenStack Horizon """ import logging @@ -24,7 +24,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack horizon configuration") + logging.debug("Adding OpenStack Horizon configuration") paramsList = [ {"CMD_OPTION" : "os-horizon-host", "USAGE" : "The IP address of the server on which to install Horizon", @@ -58,7 +58,7 @@ def initSequences(controller): return steps = [ - {'title': 'Creating OS Horizon Manifest', 'functions':[createmanifest]} + {'title': 'Adding Horizon manifest entries', 'functions': [createmanifest]} ] controller.addSequence("Installing OpenStack Horizon", [], [], steps) diff --git a/packstack/plugins/glance_200.py b/packstack/plugins/glance_200.py index e3d1d4304..bdc6d7e4c 100644 --- a/packstack/plugins/glance_200.py +++ b/packstack/plugins/glance_200.py @@ -24,7 +24,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack Glance configuration") + logging.debug("Adding OpenStack Glance configuration") paramsList = [ {"CMD_OPTION" : "glance-host", "USAGE" : "The IP address of the server on which to install Glance", @@ -86,10 +86,10 @@ def initSequences(controller): return glancesteps = [ - {'title': 'Adding Glance Keystone Manifest entries', 'functions':[createkeystonemanifest]}, - {'title': 'Creating Galnce Manifest', 'functions':[createmanifest]} + {'title': 'Adding Glance Keystone manifest entries', 'functions':[createkeystonemanifest]}, + {'title': 'Adding Glance manifest entries', 'functions':[createmanifest]} ] - controller.addSequence("Installing Glance", [], [], glancesteps) + controller.addSequence("Installing OpenStack Glance", [], [], glancesteps) def createkeystonemanifest(): manifestfile = "%s_keystone.pp" % controller.CONF['CONFIG_KEYSTONE_HOST'] diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index f14eece0e..9f2f1900c 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -25,7 +25,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack Keystone configuration") + logging.debug("Adding OpenStack Keystone configuration") paramsList = [ {"CMD_OPTION" : "keystone-host", "USAGE" : "The IP address of the server on which to install Keystone", @@ -92,9 +92,9 @@ def initConfig(controllerObject): def initSequences(controller): keystonesteps = [ - {'title': 'Creating Keystone Manifest', 'functions':[createmanifest]} + {'title': 'Adding Keystone manifest entries', 'functions':[createmanifest]} ] - controller.addSequence("Installing Keystone", [], [], keystonesteps) + controller.addSequence("Installing OpenStack Keystone", [], [], keystonesteps) def createmanifest(): manifestfile = "%s_keystone.pp"%controller.CONF['CONFIG_KEYSTONE_HOST'] diff --git a/packstack/plugins/mysql_001.py b/packstack/plugins/mysql_001.py index 2c1d85560..5a2c16c8b 100644 --- a/packstack/plugins/mysql_001.py +++ b/packstack/plugins/mysql_001.py @@ -24,7 +24,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding MySQL Openstack configuration") + logging.debug("Adding MySQL OpenStack configuration") paramsList = [ {"CMD_OPTION" : "mysql-host", "USAGE" : "The IP address of the server on which to install MySQL", @@ -79,7 +79,7 @@ def initConfig(controllerObject): def initSequences(controller): mysqlsteps = [ - {'title': 'Create MySQL Manifest', + {'title': 'Adding MySQL manifest entries', 'functions':[createmanifest]} ] controller.addSequence("Installing MySQL", [], [], mysqlsteps) diff --git a/packstack/plugins/nova_300.py b/packstack/plugins/nova_300.py index 8290b683c..00e1da74b 100644 --- a/packstack/plugins/nova_300.py +++ b/packstack/plugins/nova_300.py @@ -209,16 +209,16 @@ def initSequences(controller): return novaapisteps = [ - {'title': 'Adding Nova API Manifest entries', 'functions':[createapimanifest]}, - {'title': 'Adding Nova Keystone Manifest entries', 'functions':[createkeystonemanifest]}, - {'title': 'Adding Nova Cert Manifest entries', 'functions':[createcertmanifest]}, - {'title': 'Adding Nova Compute Manifest entries', 'functions':[createcomputemanifest]}, - {'title': 'Adding Nova Network Manifest entries', 'functions':[createnetworkmanifest]}, - {'title': 'Adding Nova Scheduler Manifest entries', 'functions':[createschedmanifest]}, - {'title': 'Adding Nova VNC Proxy Manifest entries', 'functions':[createvncproxymanifest]}, - {'title': 'Adding Nova Common Manifest entries', 'functions':[createcommonmanifest]}, + {'title': 'Adding Nova API manifest entries', 'functions':[createapimanifest]}, + {'title': 'Adding Nova Keystone manifest entries', 'functions':[createkeystonemanifest]}, + {'title': 'Adding Nova Cert manifest entries', 'functions':[createcertmanifest]}, + {'title': 'Adding Nova Compute manifest entries', 'functions':[createcomputemanifest]}, + {'title': 'Adding Nova Network manifest entries', 'functions':[createnetworkmanifest]}, + {'title': 'Adding Nova Scheduler manifest entries', 'functions':[createschedmanifest]}, + {'title': 'Adding Nova VNC Proxy manifest entries', 'functions':[createvncproxymanifest]}, + {'title': 'Adding Nova Common manifest entries', 'functions':[createcommonmanifest]}, ] - controller.addSequence("Installing Nova API", [], [], novaapisteps) + controller.addSequence("Installing OpenStack Nova API", [], [], novaapisteps) def createapimanifest(): manifestfile = "%s_api_nova.pp"%controller.CONF['CONFIG_NOVA_API_HOST'] diff --git a/packstack/plugins/openstack_client_400.py b/packstack/plugins/openstack_client_400.py index bd8dd37dc..d98cff020 100644 --- a/packstack/plugins/openstack_client_400.py +++ b/packstack/plugins/openstack_client_400.py @@ -1,5 +1,5 @@ """ -Installs and configures an openstack client +Installs and configures an OpenStack Client """ import logging @@ -23,10 +23,10 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack client configuration") + 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, @@ -57,7 +57,7 @@ def initSequences(controller): return osclientsteps = [ - {'title': 'Creating OS Client Manifest', 'functions':[createmanifest]} + {'title': 'Adding OpenStack Client manifest entries', 'functions':[createmanifest]} ] controller.addSequence("Installing OpenStack Client", [], [], osclientsteps) diff --git a/packstack/plugins/postscript_949.py b/packstack/plugins/postscript_949.py index 3a11ad315..607ce51dd 100644 --- a/packstack/plugins/postscript_949.py +++ b/packstack/plugins/postscript_949.py @@ -1,5 +1,5 @@ """ -Installs and configures an openstack client +Installs and configures an OpenStack Client """ import logging @@ -39,9 +39,9 @@ def initConfig(controllerObject): def initSequences(controller): osclientsteps = [ - {'title': 'Running Post install scripts', 'functions':[createmanifest]} + {'title': 'Adding post install manifest entries', 'functions':[createmanifest]} ] - controller.addSequence("Running Post install scripts", [], [], osclientsteps) + controller.addSequence("Running post install scripts", [], [], osclientsteps) def createmanifest(): for hostname in gethostlist(controller.CONF): diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py index d2ab82b3e..55f124dd2 100644 --- a/packstack/plugins/prescript_000.py +++ b/packstack/plugins/prescript_000.py @@ -1,5 +1,5 @@ """ -Plugin responsible for setting Openstack global options +Plugin responsible for setting OpenStack global options """ import uuid @@ -86,8 +86,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", @@ -98,8 +98,8 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "ntp-severs", - "USAGE" : "Comma separated list of NTP servers. Leave plain if packstack should not install ntpd on instances.", - "PROMPT" : "Enter list of NTP server(s). Leave plain if packstack should not install ntpd on instances.", + "USAGE" : "Comma separated list of NTP servers. Leave plain if Packstack should not install ntpd on instances.", + "PROMPT" : "Enter list of NTP server(s). Leave plain if Packstack should not install ntpd on instances.", "OPTION_LIST" : [], "VALIDATION_FUNC" : lambda param, options: True, "DEFAULT_VALUE" : '', @@ -120,9 +120,9 @@ def initConfig(controllerObject): def initSequences(controller): osclientsteps = [ - {'title': 'Running Pre install scripts', 'functions':[createmanifest]} + {'title': 'Adding pre install manifest entries', 'functions':[createmanifest]} ] - controller.addSequence("Running Pre install scripts", [], [], osclientsteps) + controller.addSequence("Running pre install scripts", [], [], osclientsteps) if controller.CONF['CONFIG_NTP_SERVERS']: ntp_step = [{'functions': [create_ntp_manifest], diff --git a/packstack/plugins/puppet_950.py b/packstack/plugins/puppet_950.py index fcac60cb8..5e7c85376 100644 --- a/packstack/plugins/puppet_950.py +++ b/packstack/plugins/puppet_950.py @@ -30,7 +30,7 @@ MODULEDIR = os.path.join(PUPPETDIR, "modules") def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack Puppet configuration") + logging.debug("Adding OpenStack Puppet configuration") paramsList = [ ] @@ -51,8 +51,8 @@ def initSequences(controller): controller.insertSequence("Clean Up", [], [], puppetpresteps, index=0) puppetsteps = [ - {'title': 'Installing Puppet', 'functions':[installpuppet]}, - {'title': 'Copying Puppet modules/manifests', 'functions':[copyPuppetModules]}, + {'title': 'Installing Puppet', 'functions': [installpuppet]}, + {'title': 'Copying Puppet modules and manifests', 'functions':[copyPuppetModules]}, {'title': 'Applying Puppet manifests', 'functions':[applyPuppetManifest]}, ] controller.addSequence("Puppet", [], [], puppetsteps) diff --git a/packstack/plugins/qpid_002.py b/packstack/plugins/qpid_002.py index 73b17446e..25c1aa028 100644 --- a/packstack/plugins/qpid_002.py +++ b/packstack/plugins/qpid_002.py @@ -23,7 +23,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack QPID configuration") + logging.debug("Adding OpenStack QPID configuration") paramsList = [ {"CMD_OPTION" : "qpid-host", "USAGE" : "The IP address of the server on which to install the QPID service", @@ -57,7 +57,7 @@ def initSequences(controller): if controller.CONF['CONFIG_NOVA_INSTALL'] != 'y': return qpidsteps = [ - {'title': 'Creating QPID Manifest', 'functions':[createmanifest]} + {'title': 'Adding QPID manifest entries', 'functions':[createmanifest]} ] controller.addSequence("Installing QPID", [], [], qpidsteps) diff --git a/packstack/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py index aa7d53dfd..f84bf4776 100644 --- a/packstack/plugins/serverprep_901.py +++ b/packstack/plugins/serverprep_901.py @@ -26,7 +26,7 @@ def initConfig(controllerObject): conf_params = {"SERVERPREPARE": [ {"CMD_OPTION" : "use-epel", "USAGE" : "Install OpenStack from EPEL. If set to \"y\" EPEL will be installed on each server", - "PROMPT" : "Should packstack install EPEL on each server", + "PROMPT" : "Should Packstack install EPEL on each server", "OPTION_LIST" : ["y", "n"], "VALIDATION_FUNC" : validate.validateOptions, "DEFAULT_VALUE" : "n", @@ -90,9 +90,9 @@ def initConfig(controllerObject): def initSequences(controller): preparesteps = [ - {'title': 'Preparing Servers', 'functions':[serverprep]} + {'title': 'Preparing servers', 'functions':[serverprep]} ] - controller.addSequence("Prepare Server", [], [], preparesteps) + controller.addSequence("Preparing servers", [], [], preparesteps) def serverprep(): diff --git a/packstack/plugins/sshkeys_000.py b/packstack/plugins/sshkeys_000.py index 300d4e751..a05d5ac04 100644 --- a/packstack/plugins/sshkeys_000.py +++ b/packstack/plugins/sshkeys_000.py @@ -55,10 +55,10 @@ def initConfig(controllerObject): def initSequences(controller): puppetsteps = [ - {'title': 'Setting Up ssh keys', + {'title': 'Setting up ssh keys', 'functions':[installKeys]} ] - controller.addSequence("ssh key setup", [], [], puppetsteps) + controller.addSequence("Setting up ssh keys", [], [], puppetsteps) def installKeys(): diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py index f7a013543..b8f486a61 100644 --- a/packstack/plugins/swift_600.py +++ b/packstack/plugins/swift_600.py @@ -1,5 +1,5 @@ """ -Installs and configures an openstack swift +Installs and configures an OpenStack Swift """ import uuid @@ -25,7 +25,7 @@ logging.debug("plugin %s loaded", __name__) def initConfig(controllerObject): global controller controller = controllerObject - logging.debug("Adding Openstack swift configuration") + logging.debug("Adding OpenStack Swift configuration") paramsList = [ {"CMD_OPTION" : "os-swift-proxy", "USAGE" : "The IP address on which to install the Swift proxy service", @@ -116,11 +116,11 @@ def initSequences(controller): return steps = [ - {'title': 'Adding Swift Keystone Manifest entries', 'functions':[createkeystonemanifest]}, - {'title': 'Creating OS Swift builder Manifests', 'functions':[createbuildermanifest]}, - {'title': 'Creating OS Swift proxy Manifests', 'functions':[createproxymanifest]}, - {'title': 'Creating OS Swift storage Manifests', 'functions':[createstoragemanifest]}, - {'title': 'Creating OS Swift Common Manifests', 'functions':[createcommonmanifest]}, + {'title': 'Adding Swift Keystone manifest entries', 'functions':[createkeystonemanifest]}, + {'title': 'Adding Swift builder manifest entries', 'functions':[createbuildermanifest]}, + {'title': 'Adding Swift proxy manifest entries', 'functions':[createproxymanifest]}, + {'title': 'Adding Swift storage manifest entries', 'functions':[createstoragemanifest]}, + {'title': 'Adding Swift common manifest entries', 'functions':[createcommonmanifest]}, ] controller.addSequence("Installing OpenStack Swift", [], [], steps)