x
/
packstack
Code Issues Proposed changes

Revert "auth_uri and auth_version fix for services" 

This reverts commit 7100bd7251.

The issue referenced by the bz was fixed already on the Cinder side,
and this patch seems to be breaking other functionality. Let's revert
and see if it works better.

Change-Id: Ibce64d279309ac44d1345bf7939d9fcbdd9c7011
This commit is contained in:
Javier Peña 2016-02-25 15:23:38 +00:00 committed by Javier Pena
parent 7100bd7251
commit 5a5557665a
11 changed files with 5 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/plugins/keystone_100.py
View File

@ -787,8 +787,9 @@ def create_manifest(config, messages):
else:
config['CONFIG_KEYSTONE_HOST_URL'] = config['CONFIG_CONTROLLER_HOST']
config['CONFIG_KEYSTONE_PUBLIC_URL'] = "http://%s:5000" % (
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']

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

@ -57,8 +57,3 @@ class { '::ceilometer::api':
keystone_identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_password => hiera('CONFIG_CEILOMETER_KS_PW'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
ceilometer_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}

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

@ -17,11 +17,6 @@ class { '::cinder::api':
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
cinder_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}
class { '::cinder::scheduler': }
class { '::cinder::volume': }

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

@ -30,11 +30,6 @@ class { '::glance::api':
os_region_name => hiera('CONFIG_KEYSTONE_REGION'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
glance_api_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}
class { '::glance::registry':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
@ -46,8 +41,3 @@ class { '::glance::registry':
verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
glance_registry_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}

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

@ -33,8 +33,3 @@ class { '::heat':
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
heat_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}

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

@ -3,16 +3,10 @@ ironic_config {
}
class { '::ironic::api':
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
admin_password => hiera('CONFIG_IRONIC_KS_PW'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
ironic_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}
class { '::ironic::client': }
class { '::ironic::conductor': }

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

@ -14,16 +14,6 @@ class { '::manila::api':
keystone_tenant => 'services',
keystone_user => 'manila',
keystone_auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
manila_config {
'keystone_authtoken/identity_uri': value => hiera('CONFIG_KEYSTONE_ADMIN_URL');
'keystone_authtoken/auth_uri': value => hiera('CONFIG_KEYSTONE_PUBLIC_URL');
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
'keystone_authtoken/admin_tenant_name': value => 'services';
'keystone_authtoken/admin_user': value => 'manila';
'keystone_authtoken/admin_password': value => hiera('CONFIG_MANILA_KS_PW'), secret => true;
}
class { '::manila::scheduler':

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

@ -8,14 +8,6 @@ class { '::neutron::server':
enabled => true,
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
neutron_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}
neutron_api_config {
'filter:authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}
# TODO: FIXME: remove this hack after upstream resolves https://bugs.launchpad.net/puppet-neutron/+bug/1474961
if hiera('CONFIG_NEUTRON_VPNAAS') == 'y' {
ensure_resource( 'package', 'neutron-vpnaas-agent', {
@ -45,3 +37,4 @@ file { '/etc/neutron/api-paste.ini':
}
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']

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

@ -25,11 +25,6 @@ class { '::nova::api':
pci_alias => hiera('CONFIG_NOVA_PCI_ALIAS'),
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
nova_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}
Package<| title == 'nova-common' |> -> Class['nova::api']
$db_purge = hiera('CONFIG_NOVA_DB_PURGE_ENABLE')

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

@ -38,8 +38,3 @@ class { '::sahara':
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,
}
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
sahara_config {
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
}

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

@ -8,8 +8,7 @@ class { '::trove::api':
bind_host => $bind_host,
enabled => true,
keystone_password => hiera('CONFIG_TROVE_KS_PW'),
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
cert_file => false,
key_file => false,
ca_file => false,
@ -29,9 +28,7 @@ class { '::trove::taskmanager':
debug => hiera('CONFIG_DEBUG_MODE'),
}
# TO-DO: Remove this as soon as bz#1298245 is resolved.
trove_config {
# TO-DO: Remove this as soon as bz#1298245 is resolved.
'DEFAULT/api_paste_config': value => '/usr/share/trove/trove-dist-paste.ini';
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
'keystone_authtoken/auth_version' : value => hiera('CONFIG_KEYSTONE_API_VERSION');
}