diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index c59179741..ba4a284b5 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -59,7 +59,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : uuid.uuid4().hex, "MASK_INPUT" : True, "LOOSE_VALIDATION": False, - "CONF_NAME" : "CONFIG_KEYSTONE_ADMINTOKEN", + "CONF_NAME" : "CONFIG_KEYSTONE_ADMIN_TOKEN", "USE_DEFAULT" : True, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -71,7 +71,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : uuid.uuid4().hex[:16], "MASK_INPUT" : True, "LOOSE_VALIDATION": False, - "CONF_NAME" : "CONFIG_KEYSTONE_ADMINPASSWD", + "CONF_NAME" : "CONFIG_KEYSTONE_ADMIN_PW", "USE_DEFAULT" : True, "NEED_CONFIRM" : False, "CONDITION" : False }, diff --git a/packstack/plugins/serverprep_901.py b/packstack/plugins/serverprep_901.py index 7b550e91e..75dd9697d 100644 --- a/packstack/plugins/serverprep_901.py +++ b/packstack/plugins/serverprep_901.py @@ -53,24 +53,24 @@ def initConfig(controllerObject): "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "rh-username", - "USAGE" : "To subscribe each server with Red Hat subscription manager, include this with CONFIG_RH_PASSWORD", + "USAGE" : "To subscribe each server with Red Hat subscription manager, include this with CONFIG_RH_PW", "PROMPT" : "To subscribe each server to Red Hat enter a username here", "OPTION_LIST" : [], "DEFAULT_VALUE" : "", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, - "CONF_NAME" : "CONFIG_RH_USERNAME", + "CONF_NAME" : "CONFIG_RH_USER", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, {"CMD_OPTION" : "rh-password", - "USAGE" : "To subscribe each server with Red Hat subscription manager, include this with CONFIG_RH_USERNAME", + "USAGE" : "To subscribe each server with Red Hat subscription manager, include this with CONFIG_RH_USER", "PROMPT" : "To subscribe each server to Red Hat enter your password here", "OPTION_LIST" : [], "DEFAULT_VALUE" : "", "MASK_INPUT" : True, "LOOSE_VALIDATION": True, - "CONF_NAME" : "CONFIG_RH_PASSWORD", + "CONF_NAME" : "CONFIG_RH_PW", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -109,7 +109,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "", "MASK_INPUT" : False, "LOOSE_VALIDATION": True, - "CONF_NAME" : "CONFIG_SATELLITE_USERNAME", + "CONF_NAME" : "CONFIG_SATELLITE_USER", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -121,7 +121,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "", "MASK_INPUT" : True, "LOOSE_VALIDATION": False, - "CONF_NAME" : "CONFIG_SATELLITE_PASSWORD", + "CONF_NAME" : "CONFIG_SATELLITE_PW", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -181,7 +181,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "", "MASK_INPUT" : True, "LOOSE_VALIDATION": False, - "CONF_NAME" : "CONFIG_SATELLITE_PROXY_USERNAME", + "CONF_NAME" : "CONFIG_SATELLITE_PROXY_USER", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -192,7 +192,7 @@ def initConfig(controllerObject): "DEFAULT_VALUE" : "", "MASK_INPUT" : True, "LOOSE_VALIDATION": False, - "CONF_NAME" : "CONFIG_SATELLITE_PROXY_PASSWORD", + "CONF_NAME" : "CONFIG_SATELLITE_PROXY_PW", "USE_DEFAULT" : False, "NEED_CONFIRM" : False, "CONDITION" : False }, @@ -326,21 +326,21 @@ def initSequences(controller): def serverprep(): config = controller.CONF - rh_username = config["CONFIG_RH_USERNAME"].strip() - rh_password = config["CONFIG_RH_PASSWORD"].strip() + rh_username = config["CONFIG_RH_USER"].strip() + rh_password = config["CONFIG_RH_PW"].strip() sat_registered = set() satellite_flags = map(lambda i: i.strip(), config["CONFIG_SATELLITE_FLAGS"].split(',')) satellite_url = config["CONFIG_SATELLITE_URL"] - satellite_args = {'username': config["CONFIG_SATELLITE_USERNAME"].strip(), - 'password': config["CONFIG_SATELLITE_PASSWORD"].strip(), + satellite_args = {'username': config["CONFIG_SATELLITE_USER"].strip(), + 'password': config["CONFIG_SATELLITE_PW"].strip(), 'cacert': config["CONFIG_SATELLITE_CACERT"].strip(), 'activation_key': config["CONFIG_SATELLITE_AKEY"].strip(), 'profile_name': config["CONFIG_SATELLITE_PROFILE"].strip(), 'proxy_host': config["CONFIG_SATELLITE_PROXY"].strip(), - 'proxy_user': config["CONFIG_SATELLITE_PROXY_USERNAME"].strip(), - 'proxy_pass': config["CONFIG_SATELLITE_PROXY_PASSWORD"].strip(), + 'proxy_user': config["CONFIG_SATELLITE_PROXY_USER"].strip(), + 'proxy_pass': config["CONFIG_SATELLITE_PROXY_PW"].strip(), 'flags': satellite_flags} for hostname in gethostlist(config): diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp index 4c11bf0f1..d7f2032a1 100644 --- a/packstack/puppet/templates/keystone.pp +++ b/packstack/puppet/templates/keystone.pp @@ -1,11 +1,11 @@ class {"keystone": - admin_token => "%(CONFIG_KEYSTONE_ADMINTOKEN)s", + admin_token => "%(CONFIG_KEYSTONE_ADMIN_TOKEN)s", sql_connection => "mysql://keystone_admin:%(CONFIG_KEYSTONE_DB_PW)s@%(CONFIG_MYSQL_HOST)s/keystone", } class {"keystone::roles::admin": email => "test@test.com", - password => "%(CONFIG_KEYSTONE_ADMINPASSWD)s", + password => "%(CONFIG_KEYSTONE_ADMIN_PW)s", admin_tenant => "admin" } diff --git a/packstack/puppet/templates/openstack_client.pp b/packstack/puppet/templates/openstack_client.pp index da3e1562f..fe2adb219 100644 --- a/packstack/puppet/templates/openstack_client.pp +++ b/packstack/puppet/templates/openstack_client.pp @@ -12,7 +12,7 @@ file {"${::home_dir}/keystonerc_admin": mode => '0600', content => "export OS_USERNAME=admin export OS_TENANT_NAME=admin -export OS_PASSWORD=%(CONFIG_KEYSTONE_ADMINPASSWD)s +export OS_PASSWORD=%(CONFIG_KEYSTONE_ADMIN_PW)s export OS_AUTH_URL=http://%(CONFIG_KEYSTONE_HOST)s:35357/v2.0/ export PS1=\"[\\u@\\h \\W(keystone_admin)]\$ \" ", diff --git a/tests/test_plugin_serverprep.py b/tests/test_plugin_serverprep.py index 3b809c0ac..730f039d3 100644 --- a/tests/test_plugin_serverprep.py +++ b/tests/test_plugin_serverprep.py @@ -33,20 +33,20 @@ class OSPluginUtilsTestCase(PackstackTestCaseMixin, TestCase): serverprep_901.controller.CONF["CONFIG_KEYSTONE_HOST"] = "1.2.3.4" serverprep_901.controller.CONF["CONFIG_USE_EPEL"] = "n" serverprep_901.controller.CONF["CONFIG_REPO"] = "" - serverprep_901.controller.CONF["CONFIG_RH_USERNAME"] = "testuser" - serverprep_901.controller.CONF["CONFIG_RH_PASSWORD"] = password + serverprep_901.controller.CONF["CONFIG_RH_USER"] = "testuser" + serverprep_901.controller.CONF["CONFIG_RH_PW"] = password serverprep_901.controller.CONF["CONFIG_RH_BETA_REPO"] = "n" serverprep_901.controller.CONF["CONFIG_SATELLITE_FLAGS"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_URL"] = "" - serverprep_901.controller.CONF["CONFIG_SATELLITE_USERNAME"] = "" - serverprep_901.controller.CONF["CONFIG_SATELLITE_PASSWORD"] = "" + serverprep_901.controller.CONF["CONFIG_SATELLITE_USER"] = "" + serverprep_901.controller.CONF["CONFIG_SATELLITE_PW"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_CACERT"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_AKEY"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_PROFILE"] = "" serverprep_901.controller.CONF["CONFIG_SATELLITE_PROXY"] = "" - serverprep_901.controller.CONF["CONFIG_SATELLITE_PROXY_USERNAME"] = "" - serverprep_901.controller.CONF["CONFIG_SATELLITE_PROXY_PASSWORD"] = "" + serverprep_901.controller.CONF["CONFIG_SATELLITE_PROXY_USER"] = "" + serverprep_901.controller.CONF["CONFIG_SATELLITE_PROXY_PW"] = "" serverprep_901.serverprep()