x
/
packstack
Code Issues Proposed changes

Switch glance,cinder to use authtoken classes 

This change updates the cinder and glance scripts to use the new method
for configuring the keystone authtoken middleware.  The old variables
are going to be removed as part of the Ocata cycle.

Change-Id: I68d8ca273f4eb89431143f070a8b805421d6193f
This commit is contained in:
Alex Schultz 2016-10-26 09:15:32 -06:00
parent c613d4b5ea
commit 8a69cd7cb4
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/puppet/modules/packstack/manifests/cinder.pp
View File

@ -25,15 +25,14 @@ class packstack::cinder ()
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
$cinder_keystone_url = regsubst(regsubst(hiera('CONFIG_KEYSTONE_PUBLIC_URL'),'/v2.0',''),'/v3','')
class { '::cinder::keystone::authtoken':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_CINDER_KS_PW'),
}
class { '::cinder::api':
bind_host => $bind_host,
keystone_password => hiera('CONFIG_CINDER_KS_PW'),
keystone_tenant => 'services',
keystone_user => 'cinder',
auth_uri => $cinder_keystone_url,
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
nova_catalog_info => 'compute:nova:publicURL',
nova_catalog_admin_info => 'compute:nova:adminURL',
service_workers => hiera('CONFIG_SERVICE_WORKERS'),

22
packstack/puppet/modules/packstack/manifests/glance.pp
View File

@ -19,14 +19,15 @@ class packstack::glance ()
# TO-DO(mmagr): Add IPv6 support when hostnames are used
}
class { '::glance::api::authtoken':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_GLANCE_KS_PW'),
}
class { '::glance::api':
bind_host => $bind_host,
registry_host => $registry_host,
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
keystone_tenant => 'services',
keystone_user => 'glance',
keystone_password => hiera('CONFIG_GLANCE_KS_PW'),
pipeline => 'keystone',
database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
debug => hiera('CONFIG_DEBUG_MODE'),
@ -35,13 +36,14 @@ class packstack::glance ()
known_stores => ['file', 'http', 'swift']
}
class { '::glance::registry::authtoken':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
password => hiera('CONFIG_GLANCE_KS_PW'),
}
class { '::glance::registry':
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
bind_host => $bind_host,
keystone_tenant => 'services',
keystone_user => 'glance',
keystone_password => hiera('CONFIG_GLANCE_KS_PW'),
database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
debug => hiera('CONFIG_DEBUG_MODE'),
workers => hiera('CONFIG_SERVICE_WORKERS'),