second vip added; main_address and admin_address modified; identity_uri added

manifests/profile/heat.pp

@@ -2,14 +2,21 @@ class iaas::profile::heat (
   $password = hiera('iaas::profile::heat::password', undef),
   $encryption_key = hiera('iaas::profile::heat::encryption_key', undef),
   $public_interface = hiera('iaas::public_interface', undef),
+  $admin_interface = hiera('iaas::admin_interface', undef),
 
 ##verbose, debug
   $verbose = hiera('iaas::verbose', undef),
   $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::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),
@@ -21,16 +28,16 @@ class iaas::profile::heat (
 
   class { '::heat::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,
   }
   class { '::heat::keystone::auth_cfn':
     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,
   }
 
@@ -39,39 +46,38 @@ class iaas::profile::heat (
     verbose => $verbose,
     debug => $debug,
     database_connection => $iaas::resources::connectors::heat,
-
 ##rabbit_hosts - uncomment as needed
 #    rabbit_host => $endpoint,
     rpc_backend => "rabbit",
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
-    auth_uri => "http://${endpoint}:5000/v2.0",
+    auth_uri => "http://${endpoint_main}:5000/v2.0",
 ##Identity_uri - planed to be implemented#
-#    identity_uri => "http://${endpoint}:35357",
-    keystone_host => $endpoint,
+#    identity_uri => "http://${endpoint_admin}:35357",
+    keystone_host => $endpoint_admin,
     keystone_password => $password,
     mysql_module => '2.3',
     database_idle_timeout => 3600,
 #    region_name => $region,
-    keystone_ec2_uri => "http://${endpoint}:5000/v2.0",
+    keystone_ec2_uri => "http://${endpoint_main}:5000/v2.0",
   }
 
   class { '::heat::api':
-    bind_host => $::facts["ipaddress_${public_interface}"],
+    bind_host => $::facts["ipaddress_${admin_interface}"],
   }
   class { '::heat::api_cfn':
-    bind_host => $::facts["ipaddress_${public_interface}"],
+    bind_host => $::facts["ipaddress_${admin_interface}"],
   }
   class { '::heat::api_cloudwatch': 
-    bind_host => $::facts["ipaddress_${public_interface}"],
+    bind_host => $::facts["ipaddress_${admin_interface}"],
   }
 
   class { '::heat::engine':
     auth_encryption_key => $encryption_key,
-    heat_metadata_server_url => "http://${endpoint}:8000",
-    heat_waitcondition_server_url => "http://${endpoint}:8000/v1/waitcondition",
-    heat_watch_server_url => "http://${endpoint}:8003",
+    heat_metadata_server_url => "http://${endpoint_main}:8000",
+    heat_waitcondition_server_url => "http://${endpoint_main}:8000/v1/waitcondition",
+    heat_watch_server_url => "http://${endpoint_main}:8003",
   }
 
   file { "/usr/bin/heat-keystone-setup-domain":
@@ -82,7 +88,7 @@ class iaas::profile::heat (
   } ->
 
   class { 'heat::keystone::domain':
-    auth_url => "http://${endpoint}:35357/v2.0",
+    auth_url => "http://${endpoint_admin}:35357/v2.0",
     keystone_admin => "heat",
     keystone_password => $password,
     keystone_tenant   => "services",
@@ -91,4 +97,8 @@ class iaas::profile::heat (
     domain_password => 'heat_admin',
   }
 
+  heat_config {
+    'keystone_authtoken/identity_uri' :value => "http://${endpoint_admin}:35357";
+  }
+
 }