Merge "Deploy Aodh services, replacing Ceilometer Alarm"

diff --cc environments/enable-tls.yaml
Simple merge

diff --cc network/endpoints/endpoint_data.yaml
Simple merge

diff --cc network/endpoints/endpoint_map.yaml
Simple merge

diff --cc overcloud.yaml
index 2267521,35a0db1..cdd7af6
--- 1/overcloud.yaml
--- 2/overcloud.yaml
+++ b/overcloud.yaml
@@@ -874,8 -870,10 +880,9 @@@ resources
      properties:
        CloudName: {get_param: CloudName}
        CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
+       AodhApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
        CinderApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
        GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
 -      GlanceRegistryVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
        HeatApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
        KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
        KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/hieradata/controller.yaml
index 6d1d3b6,3c60e90..3e523f1
--- 1/puppet/hieradata/controller.yaml
--- 2/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@@ -30,11 -29,9 +30,12 @@@ redis::sentinel::master_name: "%{hiera(
  redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}"
  redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
  
 +# keystone
 +keystone::roles::admin::email: 'root@localhost'
 +
  # service tenant
  glance::api::keystone_tenant: 'service'
+ aodh::api::keystone_tenant: 'service'
  glance::registry::keystone_tenant: 'service'
  neutron::server::auth_tenant: 'service'
  neutron::agents::metadata::auth_tenant: 'service'

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

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