Merge "Make the Neutron subnet ipv6_{ra,address}_mode configurable"

[apex-tripleo-heat-templates.git] / puppet / hieradata / controller.yaml

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index f52f1d0..f97bda1 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -31,7 +31,6 @@ redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
 
 # 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'
@@ -143,7 +142,6 @@ tripleo::loadbalancer::redis: true
 tripleo::loadbalancer::sahara: true
 tripleo::loadbalancer::swift_proxy_server: true
 tripleo::loadbalancer::ceilometer: true
-tripleo::loadbalancer::aodh: true
 tripleo::loadbalancer::heat_api: true
 tripleo::loadbalancer::heat_cloudwatch: true
 tripleo::loadbalancer::heat_cfn: true
@@ -256,7 +254,3 @@ tripleo::firewall::firewall_rules:
   '127 snmp':
     port: 161
     proto: 'udp'
-  '128 aodh':
-    port:
-      - 8042
-      - 13042