From: Jenkins Date: Thu, 24 Mar 2016 17:51:42 +0000 (+0000) Subject: Merge "Deploy Aodh services, replacing Ceilometer Alarm" X-Git-Tag: opnfv-6.0.0~2072 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=19e44d2a61d31982b76e3ac9d0e8bb90f9ca57e1;p=apex-tripleo-heat-templates.git Merge "Deploy Aodh services, replacing Ceilometer Alarm" --- 19e44d2a61d31982b76e3ac9d0e8bb90f9ca57e1 diff --cc overcloud.yaml index 22675210,35a0db1c..cdd7af66 --- a/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/hieradata/controller.yaml index 6d1d3b61,3c60e905..3e523f1b --- a/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'