x/packstack
Code Issues Proposed changes

Correctly switch all admin usernames to CONFIG_KEYSTONE_ADMIN_USERNAME

Browse Source 
Change-Id: I6e62375ed1d69f197e7134069d8c88ac4ae0644b
This commit is contained in:
Lukas Bezdicka
2015-04-22 14:30:15 +02:00
parent 1c0c36bf40
commit 185b932c42
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packstack/plugins/trove_850.py
View File

@@ -38,8 +38,8 @@ PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue')
def process_trove_nova_pw(param, param_name, config=None): def process_trove_nova_pw(param, param_name, config=None):
if (param == 'PW_PLACEHOLDER' and if (param == 'PW_PLACEHOLDER' and
config['CONFIG_TROVE_NOVA_USER'] == 'admin'): config['CONFIG_TROVE_NOVA_USER'] == 'trove'):
return config['CONFIG_KEYSTONE_ADMIN_PW'] return config['CONFIG_TROVE_KS_PW']
else: else:
return param return param
@@ -77,7 +77,7 @@ def initConfig(controller):
"PROMPT": "Enter the user for Trove to use to connect to Nova", "PROMPT": "Enter the user for Trove to use to connect to Nova",
"OPTION_LIST": [], "OPTION_LIST": [],
"VALIDATORS": [validators.validate_not_empty], "VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": "admin", "DEFAULT_VALUE": "trove",
"MASK_INPUT": False, "MASK_INPUT": False,
"LOOSE_VALIDATION": False, "LOOSE_VALIDATION": False,
"USE_DEFAULT": True, "USE_DEFAULT": True,
@@ -101,7 +101,7 @@ def initConfig(controller):
"PROMPT": "Enter the password for Trove to use to connect to Nova", "PROMPT": "Enter the password for Trove to use to connect to Nova",
"OPTION_LIST": [], "OPTION_LIST": [],
"VALIDATORS": [validators.validate_not_empty], "VALIDATORS": [validators.validate_not_empty],
"DEFAULT_VALUE": "PW_PLACEHOLDER", # default is admin pass "DEFAULT_VALUE": "PW_PLACEHOLDER", # default is trove pass
"PROCESSORS": [process_trove_nova_pw], "PROCESSORS": [process_trove_nova_pw],
"MASK_INPUT": True, "MASK_INPUT": True,
"LOOSE_VALIDATION": False, "LOOSE_VALIDATION": False,
@@ -156,9 +156,9 @@ def create_manifest(config, messages):
generate_ssl_cert(config, ssl_host, service, ssl_key_file, generate_ssl_cert(config, ssl_host, service, ssl_key_file,
ssl_cert_file) ssl_cert_file)
if (config['CONFIG_TROVE_NOVA_USER'] == 'admin' and if (config['CONFIG_TROVE_NOVA_USER'] == 'trove' and
config['CONFIG_TROVE_NOVA_PW'] == ''): config['CONFIG_TROVE_NOVA_PW'] == ''):
config['CONFIG_TROVE_NOVA_PW'] = config['CONFIG_KEYSTONE_ADMIN_PW'] config['CONFIG_TROVE_NOVA_PW'] = config['CONFIG_TROVE_KS_PW']
manifestfile = "%s_trove.pp" % config["CONFIG_CONTROLLER_HOST"] manifestfile = "%s_trove.pp" % config["CONFIG_CONTROLLER_HOST"]
manifestdata = getManifestTemplate(get_mq(config, "trove")) manifestdata = getManifestTemplate(get_mq(config, "trove"))

5
packstack/puppet/templates/heat.pp
View File

@@ -1,6 +1,7 @@
class { '::heat::api': } class { '::heat::api': }
$keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$heat_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL') $heat_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::heat::engine': class { '::heat::engine':
@@ -11,7 +12,7 @@ class { '::heat::engine':
configure_delegated_roles => false, configure_delegated_roles => false,
} }
keystone_user_role { 'admin@admin': keystone_user_role { "${keystone_admin}@admin":
ensure => present, ensure => present,
roles => ['admin', '_member_', 'heat_stack_owner'], roles => ['admin', '_member_', 'heat_stack_owner'],
require => Class['heat::engine'], require => Class['heat::engine'],
@@ -19,7 +20,7 @@ keystone_user_role { 'admin@admin':
class { '::heat::keystone::domain': class { '::heat::keystone::domain':
auth_url => "http://${heat_cfg_ctrl_host}:35357/v2.0", auth_url => "http://${heat_cfg_ctrl_host}:35357/v2.0",
keystone_admin => 'admin', keystone_admin => $keystone_admin,
keystone_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'), keystone_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
keystone_tenant => 'admin', keystone_tenant => 'admin',
domain_name => hiera('CONFIG_HEAT_DOMAIN'), domain_name => hiera('CONFIG_HEAT_DOMAIN'),

3
packstack/puppet/templates/nagios_server.pp
View File

@@ -55,12 +55,13 @@ class nagios_configs(){
$nagios_cfg_ks_adm_pw = hiera('CONFIG_KEYSTONE_ADMIN_PW') $nagios_cfg_ks_adm_pw = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$nagios_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL') $nagios_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
file { '/etc/nagios/keystonerc_admin': file { '/etc/nagios/keystonerc_admin':
ensure => file, ensure => file,
owner => 'nagios', owner => 'nagios',
mode => '0600', mode => '0600',
content => "export OS_USERNAME=admin content => "export OS_USERNAME=${keystone_admin_username}
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_PASSWORD=${nagios_cfg_ks_adm_pw} export OS_PASSWORD=${nagios_cfg_ks_adm_pw}
export OS_AUTH_URL=http://${nagios_cfg_ctrl_host}:35357/v2.0/ ", export OS_AUTH_URL=http://${nagios_cfg_ctrl_host}:35357/v2.0/ ",

2
packstack/puppet/templates/provision_demo.pp
View File

@@ -4,7 +4,7 @@
$password = hiera('CONFIG_KEYSTONE_DEMO_PW') $password = hiera('CONFIG_KEYSTONE_DEMO_PW')
$tenant_name = 'demo' $tenant_name = 'demo'
# admin user # admin user
$admin_username = 'admin' $admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW') $admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$admin_tenant_name = 'admin' $admin_tenant_name = 'admin'

2
packstack/puppet/templates/provision_tempest.pp
View File

@@ -15,7 +15,7 @@ if $provision_tempest_user != '' {
$tenant_name = $provision_tempest_user $tenant_name = $provision_tempest_user
# admin user # admin user
$admin_username = 'admin' $admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW') $admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$admin_tenant_name = 'admin' $admin_tenant_name = 'admin'

6
packstack/puppet/templates/sahara.pp
View File

@@ -9,9 +9,9 @@ class { '::sahara':
"mysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara", "mysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
verbose => true, verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
keystone_username => 'admin', keystone_username => 'sahara',
keystone_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'), keystone_password => hiera('CONFIG_SAHARA_KS_PW'),
keystone_tenant => 'admin', keystone_tenant => 'services',
keystone_url => "http://${sahara_cfg_controller_host}:5000/v2.0", keystone_url => "http://${sahara_cfg_controller_host}:5000/v2.0",
identity_url => "http://${sahara_cfg_controller_host}:35357/", identity_url => "http://${sahara_cfg_controller_host}:35357/",
use_neutron => ($sahara_cfg_config_neutron_install == 'y'), use_neutron => ($sahara_cfg_config_neutron_install == 'y'),