diff options
| author |   James Slagle <jslagle@redhat.com> | 2016-03-04 15:03:45 -0500 |
|---|---|---|
| committer | James Slagle <jslagle@redhat.com> | 2016-03-04 23:05:35 -0500 |
| commit | 8da8b84560fc7fcc4c332c03f4242946a18955e9 (patch) | |
| tree | 7020015b52f8d412b99241a8e04a150acfe65618 /puppet/hieradata | |
| parent | 00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7 (diff) | |
Revert "Deploy Aodh services, replacing Ceilometer Alarm"
This just a revert to see if reverting this gets back to a normal CI run time.
This reverts commit f72aed85594f223b6f888e6d0af3c880ea581a66.
Change-Id: I04a0893f6cf69f547a4db26261005e580e1fc90b
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 3 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 262c7cca..7a5e54d8 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -5,9 +5,6 @@ ssh::server::storeconfigs_enabled: false ceilometer::agent::auth::auth_region: 'regionOne' ceilometer::agent::auth::auth_tenant_name: 'service' -aodh::auth::auth_region: 'regionOne' -aodh::auth::auth_tenant_name: 'service' - nova::api::admin_tenant_name: 'service' nova::network::neutron::neutron_project_name: 'service' nova::network::neutron::neutron_username: 'neutron' diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index f52f1d0c..f97bda11 100644 --- 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 |