diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 14:31:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 14:31:00 +0000 |
| commit | 582a3115f744af151f4cd36a5ad0ac3e8ef09a7f (patch) | |
| tree | 0ae48cef435d7c2830d687b25d9c5b4e1146b0f6 /puppet/hieradata | |
| parent | 55fb175bed3a020bbc5cb1c41235f0893ac43cc4 (diff) | |
| parent | 8da8b84560fc7fcc4c332c03f4242946a18955e9 (diff) | |
Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""
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 |