second vip added; main_address and admin_address modified

manifests/profile/glance.pp

@@ -8,8 +8,14 @@ class iaas::profile::glance (
   $debug = hiera('iaas::debug', undef),
 
   $region = hiera('iaas::region', undef),
-  $endpoint = hiera('iaas::role::endpoint::main_address', undef),
+
+#VIP1
+  $endpoint_main = hiera('iaas::main_address', undef),
+#VIP2
+  $endpoint_admin = hiera('iaas::admin_address', undef),
+
 ##rhosts
+  $endpoint = hiera('iaas::role::endpoint::main_address', undef),
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),
@@ -25,21 +31,17 @@ class iaas::profile::glance (
     verbose => $verbose,
     debug => $debug,
 ##Identity_uri - planed to be implemented in Kilo
-#    identity_uri => "http://${endpoint}:35357",
-##Identity_uri - workaround in juno
-#    glance_api_config { 'keystone_authtoken/identity_uri' :
-#      value => "http://${endpoint}:35357",
-#    }
+#    identity_uri => "http://${endpoint_admin}:35357",
     bind_host => $::facts["ipaddress_${admin_interface}"],
-    auth_host => $endpoint,
+    auth_host => $endpoint_admin,
     keystone_password => $password,
-    auth_uri => "http://${endpoint}:5000/v2.0",
+    auth_uri => "http://${endpoint_main}:5000/v2.0",
     keystone_tenant => 'services',
     keystone_user => 'glance',
-    auth_url => "http://${endpoint}:5000/v2.0",
+    auth_url => "http://${endpoint_main}:5000/v2.0",
     database_connection => $iaas::resources::connectors::glance,
 ##registry_host
-    registry_host => $endpoint,
+    registry_host => $endpoint_admin,
     mysql_module => '2.3',
     database_idle_timeout => 3600,
     os_region_name => $region,
@@ -54,7 +56,7 @@ class iaas::profile::glance (
 
 ##Identity_uri - workaround in juno
   glance_api_config { 'keystone_authtoken/identity_uri' :
-    value => "http://${endpoint}:35357",
+    value => "http://${endpoint_admin}:35357",
   }
 
   class { '::glance::backend::rbd':
@@ -64,19 +66,14 @@ class iaas::profile::glance (
   }
 
   class { '::glance::registry':
-##verbose, debug
     verbose => $verbose,
     debug => $debug,
 ##Identity_uri - planed to be implemented
-#    identity_uri => "http://${endpoint}:35357",
-##Identity_uri - workaround in juno
-#    glance_registry_config { 'keystone_authtoken/identity_uri' :
-#      value => "http://${endpoint}:35357",
-#    }
+#    identity_uri => "http://${endpoint_admin}:35357",
     keystone_password => $password,
     database_connection => $iaas::resources::connectors::glance,
-    auth_host => $endpoint,
-    auth_uri => "http://${endpoint}:5000/v2.0",
+    auth_host => $endpoint_admin,
+    auth_uri => "http://${endpoint_main}:5000/v2.0",
     keystone_tenant => 'services',
     keystone_user => 'glance',
     mysql_module => '2.3',
@@ -86,7 +83,7 @@ class iaas::profile::glance (
 
 ##Identity_uri - workaround in juno
   glance_registry_config { 'keystone_authtoken/identity_uri' :
-    value => "http://${endpoint}:35357",
+    value => "http://${endpoint_admin}:35357",
   }
 
   class { '::glance::notify::rabbitmq':
@@ -102,9 +99,9 @@ class iaas::profile::glance (
 
   class  { '::glance::keystone::auth':
     password => $password,
-    public_address => $endpoint,
-    admin_address => $endpoint,
-    internal_address => $endpoint,
+    public_address => $endpoint_main,
+    admin_address => $endpoint_admin,
+    internal_address => $endpoint_admin,
     region => $region,
   }