Heat fexes; comment definitions

manifests/profile/heat.pp

 class iaas::profile::heat (
-  $password = undef,
+#password modified
+#  $password = undef,
+  $password = hiera('iaas::profile::heat::password', undef),
   $encryption_key = hiera('iaas::profile::heat::encryption_key', undef),
   $public_interface = hiera('iaas::public_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),
-#Costa - added $rhosts
+#added $rhosts
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),
 ) {
-#Costa
-#  include iaas::resources::connectors
+  include iaas::resources::connectors
 
-#Costa
-#  iaas::resources::database { 'heat': }
+  iaas::resources::database { 'heat': }
 
   class { '::heat::keystone::auth':
     password => $password,
@@ -32,26 +36,47 @@ class iaas::profile::heat (
   }
 
   class { '::heat':
+#verbose, debug
+    verbose => $verbose,
+    debug => $debug,
     database_connection => $iaas::resources::connectors::heat,
-#Costa - added rabbit_hosts
+
+#added rabbit_hosts
 #    rabbit_host => $endpoint,
+#    rpc_backend => "rabbit",
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
     auth_uri => "http://${endpoint}:5000/v2.0",
-    identity_uri => "http://${endpoint}:35357",
+#Identity_uri - planed to be implemented#
+#    identity_uri => "http://${endpoint}:35357",
+    keystone_host => $endpoint,
     keystone_password => $password,
     mysql_module => '2.3',
-    database_idle_timeout => 3,
-    region_name => $region,
+    database_idle_timeout => 3600,
+#region_name commented
+#    region_name => $region,
+
+#Set keystone_ec2_uri
+#    keystone_ec2_uri => "http://${endpoint}:5000/v2.0/ec2tokens",
+    keystone_ec2_uri => "http://${endpoint}:5000/v2.0",
   }
 
-  class { '::heat::api': }
-  class { '::heat::api_cfn': }
-  class { '::heat::api_cloudwatch': }
+  class { '::heat::api':
+    bind_host => $::facts["ipaddress_${public_interface}"],
+  }
+  class { '::heat::api_cfn':
+    bind_host => $::facts["ipaddress_${public_interface}"],
+  }
+  class { '::heat::api_cloudwatch': 
+    bind_host => $::facts["ipaddress_${public_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",
   }
 
   file { "/usr/bin/heat-keystone-setup-domain":
@@ -60,17 +85,20 @@ class iaas::profile::heat (
       group  => root,
       source => "puppet:///modules/iaas/heat-keystone-setup-domain"
   } ->
+
   class { 'heat::keystone::domain':
-    auth_url => "http://${endpoint}:5000/v2.0",
+#auth_url modified
+#    auth_url => "http://${endpoint}:5000/v2.0",
+    auth_url => "http://${endpoint}:35357/v2.0",
     keystone_admin => "heat",
     keystone_password => $password,
     keystone_tenant   => "services",
     domain_name => 'heat',
-    domain_admin => 'heat_admin',
+    domain_admin => 'heat_domain_admin',
     domain_password => 'heat_admin',
   }
 
-#Costa
+#HAproxy variables commented
 #  @@haproxy::balancermember { "heat_api_${::fqdn}":
 #    listening_service => 'heat_api_cluster',
 #    server_names => $::hostname,