From 5a5557665a6fb4705b7d13d6165840ab9d1e4eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Pe=C3=B1a?= Date: Thu, 25 Feb 2016 15:23:38 +0000 Subject: [PATCH] Revert "auth_uri and auth_version fix for services" This reverts commit 7100bd725140b34303efb2d0a5a51ae2bae78f27. 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 --- packstack/plugins/keystone_100.py | 3 ++- packstack/puppet/templates/ceilometer.pp | 5 ----- packstack/puppet/templates/cinder.pp | 5 ----- packstack/puppet/templates/glance.pp | 10 ---------- packstack/puppet/templates/heat_rabbitmq.pp | 5 ----- packstack/puppet/templates/ironic.pp | 6 ------ packstack/puppet/templates/manila.pp | 10 ---------- packstack/puppet/templates/neutron_api.pp | 9 +-------- packstack/puppet/templates/nova_api.pp | 5 ----- packstack/puppet/templates/sahara_rabbitmq.pp | 5 ----- packstack/puppet/templates/trove.pp | 7 ++----- 11 files changed, 5 insertions(+), 65 deletions(-) diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index ed25d7257..b5895fe07 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -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'] diff --git a/packstack/puppet/templates/ceilometer.pp b/packstack/puppet/templates/ceilometer.pp index 9cc80f9c9..19867056d 100644 --- a/packstack/puppet/templates/ceilometer.pp +++ b/packstack/puppet/templates/ceilometer.pp @@ -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'); -} diff --git a/packstack/puppet/templates/cinder.pp b/packstack/puppet/templates/cinder.pp index 7276866be..b53733bf2 100644 --- a/packstack/puppet/templates/cinder.pp +++ b/packstack/puppet/templates/cinder.pp @@ -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': } diff --git a/packstack/puppet/templates/glance.pp b/packstack/puppet/templates/glance.pp index ff4e80212..874f16840 100644 --- a/packstack/puppet/templates/glance.pp +++ b/packstack/puppet/templates/glance.pp @@ -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'); -} diff --git a/packstack/puppet/templates/heat_rabbitmq.pp b/packstack/puppet/templates/heat_rabbitmq.pp index 877c7e377..73b4089d2 100644 --- a/packstack/puppet/templates/heat_rabbitmq.pp +++ b/packstack/puppet/templates/heat_rabbitmq.pp @@ -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'); -} diff --git a/packstack/puppet/templates/ironic.pp b/packstack/puppet/templates/ironic.pp index fada0ad79..d87316c0b 100644 --- a/packstack/puppet/templates/ironic.pp +++ b/packstack/puppet/templates/ironic.pp @@ -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': } diff --git a/packstack/puppet/templates/manila.pp b/packstack/puppet/templates/manila.pp index 8155a55a7..c9af631f0 100644 --- a/packstack/puppet/templates/manila.pp +++ b/packstack/puppet/templates/manila.pp @@ -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': diff --git a/packstack/puppet/templates/neutron_api.pp b/packstack/puppet/templates/neutron_api.pp index 7eea35f5d..cf5a0b0f8 100644 --- a/packstack/puppet/templates/neutron_api.pp +++ b/packstack/puppet/templates/neutron_api.pp @@ -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'] + diff --git a/packstack/puppet/templates/nova_api.pp b/packstack/puppet/templates/nova_api.pp index 24d04a609..fa119a799 100644 --- a/packstack/puppet/templates/nova_api.pp +++ b/packstack/puppet/templates/nova_api.pp @@ -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') diff --git a/packstack/puppet/templates/sahara_rabbitmq.pp b/packstack/puppet/templates/sahara_rabbitmq.pp index d29a8824d..508552dee 100644 --- a/packstack/puppet/templates/sahara_rabbitmq.pp +++ b/packstack/puppet/templates/sahara_rabbitmq.pp @@ -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'); -} diff --git a/packstack/puppet/templates/trove.pp b/packstack/puppet/templates/trove.pp index d9818310c..851cc6683 100644 --- a/packstack/puppet/templates/trove.pp +++ b/packstack/puppet/templates/trove.pp @@ -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'); }