x/packstack
Code Issues Proposed changes

[Keystone] Unite keystone admin and public url configuration

Browse Source 
Change-Id: I60ab500a7bb454b129b66b43f7117bc60c3d5a0c
This commit is contained in:
Lukas Bezdicka
2015-04-30 09:47:52 -04:00
committed by Javier Pena
parent fb99b80db5
commit 0260f6400b
26 changed files with 61 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packstack/plugins/keystone_100.py
View File

@@ -771,6 +771,14 @@ def create_manifest(config, messages):
else: else:
config['CONFIG_KEYSTONE_HOST_URL'] = config['CONFIG_CONTROLLER_HOST'] config['CONFIG_KEYSTONE_HOST_URL'] = config['CONFIG_CONTROLLER_HOST']
config['CONFIG_KEYSTONE_PUBLIC_URL'] = "http://%s:5000/%s" % (
config['CONFIG_KEYSTONE_HOST_URL'],
config['CONFIG_KEYSTONE_API_VERSION']
)
config['CONFIG_KEYSTONE_ADMIN_URL'] = "http://%s:35357/" % (
config['CONFIG_KEYSTONE_HOST_URL']
)
fw_details = dict() fw_details = dict()
key = "keystone" key = "keystone"
fw_details.setdefault(key, {}) fw_details.setdefault(key, {})

11
packstack/puppet/templates/ceilometer.pp
View File

@@ -34,10 +34,8 @@ class { '::ceilometer::collector': }
class { '::ceilometer::agent::notification': } class { '::ceilometer::agent::notification': }
$config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::ceilometer::agent::auth': class { '::ceilometer::agent::auth':
auth_url => "http://${config_controller_host}:35357/v2.0", auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'), auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
} }
@@ -56,7 +54,8 @@ $bind_host = hiera('CONFIG_IP_VERSION') ? {
'ipv4' => '0.0.0.0', 'ipv4' => '0.0.0.0',
} }
class { '::ceilometer::api': class { '::ceilometer::api':
host => $bind_host, host => $bind_host,
keystone_host => hiera('CONFIG_KEYSTONE_HOST_URL'), keystone_auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_password => hiera('CONFIG_CEILOMETER_KS_PW'), keystone_identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_password => hiera('CONFIG_CEILOMETER_KS_PW'),
} }

7
packstack/puppet/templates/cinder.pp
View File

@@ -16,7 +16,8 @@ class { '::cinder::api':
keystone_password => hiera('CONFIG_CINDER_KS_PW'), keystone_password => hiera('CONFIG_CINDER_KS_PW'),
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'cinder', keystone_user => 'cinder',
keystone_auth_host => hiera('CONFIG_KEYSTONE_HOST_URL'), auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
} }
class { '::cinder::scheduler': } class { '::cinder::scheduler': }
@@ -25,14 +26,12 @@ class { '::cinder::volume': }
class { '::cinder::client': } class { '::cinder::client': }
$cinder_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
# Cinder::Type requires keystone credentials # Cinder::Type requires keystone credentials
Cinder::Type { Cinder::Type {
os_password => hiera('CONFIG_CINDER_KS_PW'), os_password => hiera('CONFIG_CINDER_KS_PW'),
os_tenant_name => 'services', os_tenant_name => 'services',
os_username => 'cinder', os_username => 'cinder',
os_auth_url => "http://${cinder_config_controller_host}:5000/v2.0/", os_auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
} }
class { '::cinder::backends': class { '::cinder::backends':

8
packstack/puppet/templates/glance.pp
View File

@@ -16,8 +16,8 @@ $registry_host = hiera('CONFIG_IP_VERSION') ? {
class { '::glance::api': class { '::glance::api':
bind_host => $bind_host, bind_host => $bind_host,
registry_host => $registry_host, registry_host => $registry_host,
auth_uri => "http://${glance_cfg_ctrl_host}:5000/", auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => "http://${glance_cfg_ctrl_host}:35357", identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'glance', keystone_user => 'glance',
keystone_password => hiera('CONFIG_GLANCE_KS_PW'), keystone_password => hiera('CONFIG_GLANCE_KS_PW'),
@@ -29,8 +29,8 @@ class { '::glance::api':
} }
class { '::glance::registry': class { '::glance::registry':
auth_uri => "http://${glance_cfg_ctrl_host}:5000/", auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => "http://${glance_cfg_ctrl_host}:35357", identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
bind_host => $bind_host, bind_host => $bind_host,
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'glance', keystone_user => 'glance',

4
packstack/puppet/templates/glance_swift.pp
View File

@@ -1,9 +1,7 @@
$gla_bd_ct_h = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::glance::backend::swift': class { '::glance::backend::swift':
swift_store_user => 'services:glance', swift_store_user => 'services:glance',
swift_store_key => hiera('CONFIG_GLANCE_KS_PW'), swift_store_key => hiera('CONFIG_GLANCE_KS_PW'),
swift_store_auth_address => "http://${gla_bd_ct_h}:35357/v2.0/", swift_store_auth_address => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
swift_store_container => 'glance', swift_store_container => 'glance',
swift_store_auth_version => '2', swift_store_auth_version => '2',
swift_store_large_object_size => '5120', swift_store_large_object_size => '5120',

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

@@ -19,7 +19,7 @@ keystone_user_role { "${keystone_admin}@admin":
} }
class { '::heat::keystone::domain': class { '::heat::keystone::domain':
auth_url => "http://${heat_cfg_ctrl_host}:35357/v2.0", auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_admin => $keystone_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',

7
packstack/puppet/templates/heat_qpid.pp
View File

@@ -1,12 +1,11 @@
$heat_qpid_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$heat_qpid_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW') $heat_qpid_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
$heat_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL') $heat_qpid_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::heat': class { '::heat':
keystone_host => $heat_cfn_cfg_ctrl_host,
keystone_password => hiera('CONFIG_HEAT_KS_PW'), keystone_password => hiera('CONFIG_HEAT_KS_PW'),
auth_uri => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0", auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_ec2_uri => "http://${heat_qpid_cfg_ctrl_host}:35357/v2.0", identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rpc_backend => 'heat.openstack.common.rpc.impl_qpid', rpc_backend => 'heat.openstack.common.rpc.impl_qpid',
qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'), qpid_hostname => hiera('CONFIG_AMQP_HOST_URL'),
qpid_username => hiera('CONFIG_AMQP_AUTH_USER'), qpid_username => hiera('CONFIG_AMQP_AUTH_USER'),

7
packstack/puppet/templates/heat_rabbitmq.pp
View File

@@ -1,4 +1,3 @@
$heat_rabbitmq_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$heat_rabbitmq_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW') $heat_rabbitmq_cfg_heat_db_pw = hiera('CONFIG_HEAT_DB_PW')
$heat_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL') $heat_rabbitmq_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
@@ -17,10 +16,10 @@ if $kombu_ssl_keyfile {
} }
class { '::heat': class { '::heat':
keystone_host => $heat_rabbitmq_cfg_ctrl_host,
keystone_password => hiera('CONFIG_HEAT_KS_PW'), keystone_password => hiera('CONFIG_HEAT_KS_PW'),
auth_uri => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0", auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_ec2_uri => "http://${heat_rabbitmq_cfg_ctrl_host}:35357/v2.0", identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rpc_backend => 'heat.openstack.common.rpc.impl_kombu', rpc_backend => 'heat.openstack.common.rpc.impl_kombu',
rabbit_host => hiera('CONFIG_AMQP_HOST_URL'), rabbit_host => hiera('CONFIG_AMQP_HOST_URL'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'), rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),

4
packstack/puppet/templates/horizon.pp
View File

@@ -1,7 +1,5 @@
include ::packstack::apache_common include ::packstack::apache_common
$keystone_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$horizon_packages = ['python-memcached', 'python-netaddr'] $horizon_packages = ['python-memcached', 'python-netaddr']
package { $horizon_packages: package { $horizon_packages:
@@ -26,7 +24,7 @@ $horizon_ssl = hiera('CONFIG_HORIZON_SSL') ? {
class {'::horizon': class {'::horizon':
secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'), secret_key => hiera('CONFIG_HORIZON_SECRET_KEY'),
keystone_url => "http://${keystone_host}:5000/v2.0", keystone_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_default_role => '_member_', keystone_default_role => '_member_',
server_aliases => [hiera('CONFIG_CONTROLLER_HOST'), $::fqdn, 'localhost'], server_aliases => [hiera('CONFIG_CONTROLLER_HOST'), $::fqdn, 'localhost'],
allowed_hosts => '*', allowed_hosts => '*',

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

@@ -3,7 +3,7 @@ ironic_config {
} }
class { '::ironic::api': class { '::ironic::api':
auth_host => hiera('CONFIG_KEYSTONE_HOST_URL'), auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
admin_password => hiera('CONFIG_IRONIC_KS_PW'), admin_password => hiera('CONFIG_IRONIC_KS_PW'),
} }

10
packstack/puppet/templates/keystone.pp
View File

@@ -1,11 +1,11 @@
$keystone_use_ssl = false $keystone_use_ssl = false
$keystone_cfg_ks_db_pw = hiera('CONFIG_KEYSTONE_DB_PW') $keystone_cfg_ks_db_pw = hiera('CONFIG_KEYSTONE_DB_PW')
$keystone_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL') $keystone_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
$keystone_endpoint_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
$keystone_token_provider_str = downcase(hiera('CONFIG_KEYSTONE_TOKEN_FORMAT')) $keystone_token_provider_str = downcase(hiera('CONFIG_KEYSTONE_TOKEN_FORMAT'))
$keystone_api_version_str = hiera('CONFIG_KEYSTONE_API_VERSION') $keystone_url = hiera('CONFIG_KEYSTONE_PUBLIC_URL')
$keystone_url = "http://${keystone_endpoint_cfg_ctrl_host}:5000/${keystone_api_version_str}" $keystone_admin_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
$keystone_admin_url = "http://${keystone_endpoint_cfg_ctrl_host}:35357/${keystone_api_version_str}" $keystone_api_version = hiera('CONFIG_KEYSTONE_API_VERSION')
$keystone_versioned_admin_url = "${keystone_admin_url}/${keystone_api_version}"
$bind_host = hiera('CONFIG_IP_VERSION') ? { $bind_host = hiera('CONFIG_IP_VERSION') ? {
'ipv6' => '::0', 'ipv6' => '::0',
'ipv4' => '0.0.0.0', 'ipv4' => '0.0.0.0',
@@ -47,7 +47,7 @@ class { '::keystone::roles::admin':
keystone::resource::service_identity { 'keystone': keystone::resource::service_identity { 'keystone':
public_url => $keystone_url, public_url => $keystone_url,
internal_url => $keystone_url, internal_url => $keystone_url,
admin_url => $keystone_admin_url, admin_url => $keystone_versioned_admin_url,
region => hiera('CONFIG_KEYSTONE_REGION'), region => hiera('CONFIG_KEYSTONE_REGION'),
service_type => 'identity', service_type => 'identity',
service_description => 'OpenStack Identity Service', service_description => 'OpenStack Identity Service',

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

@@ -1,7 +1,7 @@
class { '::manila::keystone::auth': class { '::manila::keystone::auth':
password => hiera('CONFIG_MANILA_KS_PW'), password => hiera('CONFIG_MANILA_KS_PW'),
public_address => hiera('CONFIG_KEYSTONE_HOST_URL'), public_address => hiera('CONFIG_STORAGE_HOST_URL'),
admin_address => hiera('CONFIG_KEYSTONE_HOST_URL'), admin_address => hiera('CONFIG_STORAGE_HOST_URL'),
internal_address => hiera('CONFIG_KEYSTONE_HOST_URL'), internal_address => hiera('CONFIG_STORAGE_HOST_URL'),
} }

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

@@ -1,5 +1,5 @@
class { '::swift::keystone::auth': class { '::swift::keystone::auth':
public_address => hiera('CONFIG_KEYSTONE_HOST_URL'), public_address => hiera('CONFIG_STORAGE_HOST_URL'),
region => hiera('CONFIG_KEYSTONE_REGION'), region => hiera('CONFIG_KEYSTONE_REGION'),
password => hiera('CONFIG_SWIFT_KS_PW'), password => hiera('CONFIG_SWIFT_KS_PW'),
} }

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

@@ -16,7 +16,7 @@ class { '::manila::api':
keystone_password => hiera('CONFIG_MANILA_KS_PW'), keystone_password => hiera('CONFIG_MANILA_KS_PW'),
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_user => 'manila', keystone_user => 'manila',
keystone_auth_host => hiera('CONFIG_KEYSTONE_HOST_URL'), keystone_auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
} }
class { '::manila::scheduler': class { '::manila::scheduler':

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

@@ -54,7 +54,7 @@ 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_keystone_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
$keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME') $keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
file { '/etc/nagios/keystonerc_admin': file { '/etc/nagios/keystonerc_admin':
@@ -64,7 +64,7 @@ class nagios_configs(){
content => "export OS_USERNAME=${keystone_admin_username} 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=${nagios_cfg_keystone_url}",
} }
%(CONFIG_NAGIOS_MANIFEST_CONFIG)s %(CONFIG_NAGIOS_MANIFEST_CONFIG)s

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

@@ -1,7 +1,8 @@
class { '::neutron::server': class { '::neutron::server':
database_connection => $neutron_sql_connection, database_connection => $neutron_sql_connection,
auth_password => $neutron_user_password, auth_password => $neutron_user_password,
auth_host => hiera('CONFIG_KEYSTONE_HOST_URL'), auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
enabled => true, enabled => true,
} }

4
packstack/puppet/templates/neutron_metadata.pp
View File

@@ -1,8 +1,6 @@
$neutron_metadata_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::neutron::agents::metadata': class { '::neutron::agents::metadata':
auth_password => hiera('CONFIG_NEUTRON_KS_PW'), auth_password => hiera('CONFIG_NEUTRON_KS_PW'),
auth_url => "http://${neutron_metadata_cfg_ctrl_host}:35357/v2.0", auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_region => hiera('CONFIG_KEYSTONE_REGION'), auth_region => hiera('CONFIG_KEYSTONE_REGION'),
shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'), shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'),
metadata_ip => hiera('CONFIG_KEYSTONE_HOST_URL'), metadata_ip => hiera('CONFIG_KEYSTONE_HOST_URL'),

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

@@ -6,6 +6,6 @@ class { '::neutron::server::notifications':
nova_admin_password => hiera('CONFIG_NOVA_KS_PW'), nova_admin_password => hiera('CONFIG_NOVA_KS_PW'),
nova_admin_tenant_name => 'services', nova_admin_tenant_name => 'services',
nova_url => "http://${neutron_notif_cfg_ctrl_host}:8774/v2", nova_url => "http://${neutron_notif_cfg_ctrl_host}:8774/v2",
nova_admin_auth_url => "http://${neutron_notif_cfg_ctrl_host}:35357/v2.0", nova_admin_auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
nova_region_name => hiera('CONFIG_KEYSTONE_REGION'), nova_region_name => hiera('CONFIG_KEYSTONE_REGION'),
} }

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

@@ -9,7 +9,8 @@ class { '::nova::api':
api_bind_address => $bind_host, api_bind_address => $bind_host,
metadata_listen => $bind_host, metadata_listen => $bind_host,
enabled => true, enabled => true,
auth_host => hiera('CONFIG_KEYSTONE_HOST_URL'), auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
admin_password => hiera('CONFIG_NOVA_KS_PW'), admin_password => hiera('CONFIG_NOVA_KS_PW'),
neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED'), neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED'),
} }

4
packstack/puppet/templates/nova_ceilometer.pp
View File

@@ -1,7 +1,5 @@
$nova_ceil_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::ceilometer::agent::auth': class { '::ceilometer::agent::auth':
auth_url => "http://${nova_ceil_cfg_ctrl_host}:35357/v2.0", auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'), auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
} }

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

@@ -3,7 +3,7 @@ $ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::nova::compute::ironic': class { '::nova::compute::ironic':
admin_user => 'ironic', admin_user => 'ironic',
admin_passwd => hiera('CONFIG_IRONIC_KS_PW'), admin_passwd => hiera('CONFIG_IRONIC_KS_PW'),
admin_url => "http://${ironic_config_controller_host}:35357/v2.0", admin_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
admin_tenant_name => 'services', admin_tenant_name => 'services',
api_endpoint => "http://${ironic_config_controller_host}:6385/v1", api_endpoint => "http://${ironic_config_controller_host}:6385/v1",
} }

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

@@ -1,4 +1,3 @@
$nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL') $nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::nova::network::neutron': class { '::nova::network::neutron':
@@ -6,7 +5,7 @@ class { '::nova::network::neutron':
neutron_auth_strategy => 'keystone', neutron_auth_strategy => 'keystone',
neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696", neutron_url => "http://${nova_neutron_cfg_ctrl_host}:9696",
neutron_admin_tenant_name => 'services', neutron_admin_tenant_name => 'services',
neutron_admin_auth_url => "http://${nova_neutron_cfg_ctrl_host}:35357/v2.0", neutron_admin_auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'), neutron_region_name => hiera('CONFIG_KEYSTONE_REGION'),
} }

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

@@ -14,13 +14,13 @@ if hiera('CONFIG_MANILA_INSTALL') == 'y' {
$ost_cl_keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME') $ost_cl_keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
$ost_cl_keystone_admin_pw = hiera('CONFIG_KEYSTONE_ADMIN_PW') $ost_cl_keystone_admin_pw = hiera('CONFIG_KEYSTONE_ADMIN_PW')
$ost_cl_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL') $ost_cl_ctrl_keystone_url = hiera('CONFIG_KEYSTONE_PUBLIC_URL')
$ost_cl_keystone_region = hiera('CONFIG_KEYSTONE_REGION') $ost_cl_keystone_region = hiera('CONFIG_KEYSTONE_REGION')
$ost_cl_keystone_demo_pw = hiera('CONFIG_KEYSTONE_DEMO_PW') $ost_cl_keystone_demo_pw = hiera('CONFIG_KEYSTONE_DEMO_PW')
$rcadmin_content = "export OS_USERNAME=${ost_cl_keystone_admin_username} $rcadmin_content = "export OS_USERNAME=${ost_cl_keystone_admin_username}
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export OS_PASSWORD=${ost_cl_keystone_admin_pw} export OS_PASSWORD=${ost_cl_keystone_admin_pw}
export OS_AUTH_URL=http://${ost_cl_ctrl_host}:5000/v2.0/ export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
export OS_REGION_NAME=${ost_cl_keystone_region} export OS_REGION_NAME=${ost_cl_keystone_region}
export PS1='[\\u@\\h \\W(keystone_admin)]\\$ ' export PS1='[\\u@\\h \\W(keystone_admin)]\\$ '
" "
@@ -38,7 +38,7 @@ if hiera('CONFIG_PROVISION_DEMO') == 'y' {
content => "export OS_USERNAME=demo content => "export OS_USERNAME=demo
export OS_TENANT_NAME=demo export OS_TENANT_NAME=demo
export OS_PASSWORD=${ost_cl_keystone_demo_pw} export OS_PASSWORD=${ost_cl_keystone_demo_pw}
export OS_AUTH_URL=http://${ost_cl_ctrl_host}:5000/v2.0/ export OS_AUTH_URL=${ost_cl_ctrl_keystone_url}
export PS1='[\\u@\\h \\W(keystone_demo)]\\$ ' export PS1='[\\u@\\h \\W(keystone_demo)]\\$ '
", ",
} }

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

@@ -3,7 +3,6 @@ $sahara_cfg_sahara_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
$sahara_cfg_config_neutron_install = hiera('CONFIG_NEUTRON_INSTALL') $sahara_cfg_config_neutron_install = hiera('CONFIG_NEUTRON_INSTALL')
$sahara_cfg_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::sahara': class { '::sahara':
database_connection => database_connection =>
"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",
@@ -12,8 +11,8 @@ class { '::sahara':
keystone_username => 'sahara', keystone_username => 'sahara',
keystone_password => hiera('CONFIG_SAHARA_KS_PW'), keystone_password => hiera('CONFIG_SAHARA_KS_PW'),
keystone_tenant => 'services', keystone_tenant => 'services',
keystone_url => "http://${sahara_cfg_controller_host}:5000/v2.0", keystone_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_url => "http://${sahara_cfg_controller_host}:35357/", identity_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
use_neutron => ($sahara_cfg_config_neutron_install == 'y'), use_neutron => ($sahara_cfg_config_neutron_install == 'y'),
service_host => hiera('CONFIG_SAHARA_HOST'), service_host => hiera('CONFIG_SAHARA_HOST'),
} }

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

@@ -70,6 +70,7 @@ class { '::swift::proxy::authtoken':
admin_tenant_name => 'services', admin_tenant_name => 'services',
admin_password => hiera('CONFIG_SWIFT_KS_PW'), admin_password => hiera('CONFIG_SWIFT_KS_PW'),
# assume that the controller host is the swift api server # assume that the controller host is the swift api server
auth_host => hiera('CONFIG_STORAGE_HOST_URL'), auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
} }

9
packstack/puppet/templates/trove.pp
View File

@@ -7,8 +7,7 @@ class { '::trove::api':
bind_host => $bind_host, bind_host => $bind_host,
enabled => true, enabled => true,
keystone_password => hiera('CONFIG_TROVE_KS_PW'), keystone_password => hiera('CONFIG_TROVE_KS_PW'),
auth_host => hiera('CONFIG_KEYSTONE_HOST_URL'), auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_port => 35357,
cert_file => false, cert_file => false,
key_file => false, key_file => false,
ca_file => false, ca_file => false,
@@ -16,16 +15,14 @@ class { '::trove::api':
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
} }
$trove_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
class { '::trove::conductor': class { '::trove::conductor':
auth_url => "http://${trove_cfg_ctrl_host}:5000/v2.0", auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
verbose => true, verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
} }
class { '::trove::taskmanager': class { '::trove::taskmanager':
auth_url => "http://${trove_cfg_ctrl_host}:5000/v2.0", auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
verbose => true, verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
} }