[Glance] Fix deprecation of *auth_host* parameter in Glance::Api

- *auth_host* has been deprecated in favor of *auth_uri* and *identity_uri* - Dependent of pr-264 [1] [1] - redhat-openstack/openstack-puppet-modules#264 Signed-off-by: Gael Chamoulaud <[email protected]> Change-Id: I6bc2e872d0fa487637121530e3aa0d7894eb23bf
redhat-openstack · Feb 24, 2015 · 4f38313 · 4f38313
1 parent 9bd9178
commit 4f38313
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packstack/puppet/templates/glance.pp b/packstack/puppet/templates/glance.pp
@@ -1,8 +1,10 @@
 $glance_ks_pw = hiera('CONFIG_GLANCE_DB_PW')
 $glance_mariadb_host = hiera('CONFIG_MARIADB_HOST')
+$glance_cfg_ctrl_host = hiera('CONFIG_CONTROLLER_HOST')
 
 class { 'glance::api':
-  auth_host           => hiera('CONFIG_CONTROLLER_HOST'),
+  auth_uri            => "http://${glance_cfg_ctrl_host}:5000/",
+  identity_uri        => "http://${glance_cfg_ctrl_host}:35357/v2.0",
   keystone_tenant     => 'services',
   keystone_user       => 'glance',
   keystone_password   => hiera('CONFIG_GLANCE_KS_PW'),
@@ -13,7 +15,8 @@
 }
 
 class { 'glance::registry':
-  auth_host           => hiera('CONFIG_CONTROLLER_HOST'),
+  auth_uri            => "http://${glance_cfg_ctrl_host}:5000/",
+  identity_uri        => "http://${glance_cfg_ctrl_host}:35357/v2.0",
   keystone_tenant     => 'services',
   keystone_user       => 'glance',
   keystone_password   => hiera('CONFIG_GLANCE_KS_PW'),