Merge "composable heat services"

diff --cc environments/puppet-pacemaker.yaml
index 3089885,fe450e8..679b79c
--- 1/environments/puppet-pacemaker.yaml
--- 2/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@@ -12,9 -12,8 +12,13 @@@ resource_registry
    OS::TripleO::Services::Keystone: ../puppet/services/pacemaker/keystone.yaml
    OS::TripleO::Services::GlanceApi: ../puppet/services/pacemaker/glance-api.yaml
    OS::TripleO::Services::GlanceRegistry: ../puppet/services/pacemaker/glance-registry.yaml
+   OS::TripleO::Services::HeatApi: ../puppet/services/pacemaker/heat-api.yaml
+   OS::TripleO::Services::HeatApiCfn: ../puppet/services/pacemaker/heat-api-cfn.yaml
+   OS::TripleO::Services::HeatApiCloudwatch: ../puppet/services/pacemaker/heat-api-cloudwatch.yaml
+   OS::TripleO::Services::HeatEngine: ../puppet/services/pacemaker/heat-engine.yaml
    OS::TripleO::Services::NeutronDhcpAgent: ../puppet/services/pacemaker/neutron-dhcp.yaml
 +  OS::TripleO::Services::NeutronL3Agent: ../puppet/services/pacemaker/neutron-l3.yaml
 +  OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/pacemaker/neutron-metadata.yaml
 +  OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
 +  OS::TripleO::Services::Loadbalancer: ../puppet/services/pacemaker/loadbalancer.yaml
 +  OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml

diff --cc overcloud-resource-registry-puppet.yaml
index 5807bdf,c7d178c..b207a1f
--- 1/overcloud-resource-registry-puppet.yaml
--- 2/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@@ -125,12 -126,11 +125,16 @@@ resource_registry
    OS::TripleO::Services::Keystone: puppet/services/keystone.yaml
    OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml
    OS::TripleO::Services::GlanceRegistry: puppet/services/glance-registry.yaml
+   OS::TripleO::Services::HeatApi: puppet/services/heat-api.yaml
+   OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml
+   OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml
+   OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml
    OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
 +  OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml
 +  OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml
 +  OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
 +  OS::TripleO::Services::Loadbalancer: puppet/services/loadbalancer.yaml
 +  OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
  
  parameter_defaults:
    EnablePackageInstall: false

diff --cc overcloud.yaml
index 147065c,a879830..6a42730
--- 1/overcloud.yaml
--- 2/overcloud.yaml
+++ b/overcloud.yaml
@@@ -654,12 -659,11 +646,16 @@@ parameters
        - OS::TripleO::Services::Keystone
        - OS::TripleO::Services::GlanceApi
        - OS::TripleO::Services::GlanceRegistry
+       - OS::TripleO::Services::HeatApi
+       - OS::TripleO::Services::HeatApiCfn
+       - OS::TripleO::Services::HeatApiCloudwatch
+       - OS::TripleO::Services::HeatEngine
        - OS::TripleO::Services::NeutronDhcpAgent
 +      - OS::TripleO::Services::NeutronL3Agent
 +      - OS::TripleO::Services::NeutronMetadataAgent
 +      - OS::TripleO::Services::RabbitMQ
 +      - OS::TripleO::Services::Loadbalancer
 +      - OS::TripleO::Services::Memcached
      description: A list of service resources (configured in the Heat
                   resource_registry) which represent nested stacks
                   for each service that should get installed on the Controllers.

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
index 95021a7,67f834b..bbcf83d
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -912,32 -980,8 +885,31 @@@ MYSQL_HOST=localhost\n"
  } #END STEP 4
  
  if hiera('step') >= 5 {
 +  # We now make sure that the root db password is set to a random one
 +  # At first installation /root/.my.cnf will be empty and we connect without a root
 +  # password. On second runs or updates /root/.my.cnf will already be populated
 +  # with proper credentials. This step happens on every node because this sql
 +  # statement does not automatically replicate across nodes.
 +  exec { 'galera-set-root-password':
 +    command => "/bin/touch /root/.my.cnf && /bin/echo \"UPDATE mysql.user SET Password = PASSWORD('${mysql_root_password}') WHERE user = 'root'; flush privileges;\" | /bin/mysql --defaults-extra-file=/root/.my.cnf -u root",
 +  }
 +  file { '/root/.my.cnf' :
 +    ensure  => file,
 +    mode    => '0600',
 +    owner   => 'root',
 +    group   => 'root',
 +    content => "[client]
 +user=root
 +password=\"${mysql_root_password}\"
 +
 +[mysql]
 +user=root
 +password=\"${mysql_root_password}\"",
 +    require => Exec['galera-set-root-password'],
 +  }
 +
    $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
    $cinder_enable_db_purge = hiera('cinder_enable_db_purge', true)
-   $heat_enable_db_purge = hiera('heat_enable_db_purge', true)
  
    if $nova_enable_db_purge {
      include ::nova::cron::archive_deleted_rows