summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-24 10:27:34 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-29 13:42:45 +0300
commit628be72f7ca25355f1bdd7b8b8ac8f22b5ec90d9 (patch)
tree54c3067f89ea4f392b1d55f98f797c082f3998a1 /puppet/services
parent5af569abb6922efbb6fee8198d8cd7cc741e1499 (diff)
Conditionally expose haproxy endpoints
With the introduction of the global config, HAProxy can know which endpoints to expose. It will get those via hieradata. Change-Id: I0f5ce8c7394625e8dce691ae1996457a9ea99a99
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/haproxy.yaml40
1 files changed, 20 insertions, 20 deletions
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index c0e1c113..6885449e 100644
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -55,27 +55,27 @@ outputs:
'107 haproxy stats':
dport: 1993
# TODO(emilien) make it composable to find which services are actually running
- tripleo::haproxy::keystone_admin: true
- tripleo::haproxy::keystone_public: true
- tripleo::haproxy::neutron: true
- tripleo::haproxy::cinder: true
- tripleo::haproxy::glance_api: true
- tripleo::haproxy::glance_registry: true
- tripleo::haproxy::nova_osapi: true
- tripleo::haproxy::nova_metadata: true
- tripleo::haproxy::nova_novncproxy: true
+ tripleo::haproxy::keystone_admin: '"%{hiera(\"keystone_enabled\")}"'
+ tripleo::haproxy::keystone_public: '"%{hiera(\"keystone_enabled\")}"'
+ tripleo::haproxy::neutron: '"%{hiera(\"neutron_api_enabled\")}"'
+ tripleo::haproxy::cinder: '"%{hiera(\"cinder_api_enabled\")}"'
+ tripleo::haproxy::glance_api: '"%{hiera(\"glance_api_enabled\")}"'
+ tripleo::haproxy::glance_registry: '"%{hiera(\"glance_registry_enabled\")}"'
+ tripleo::haproxy::nova_osapi: '"%{hiera(\"nova_api_enabled\")}"'
+ tripleo::haproxy::nova_metadata: '"%{hiera(\"nova_api_enabled\")}"'
+ tripleo::haproxy::nova_novncproxy: '"%{hiera(\"nova_vncproxy_enabled\")}"'
tripleo::haproxy::mysql: true
- tripleo::haproxy::redis: true
- tripleo::haproxy::sahara: true
- tripleo::haproxy::swift_proxy_server: true
- tripleo::haproxy::ceilometer: true
- tripleo::haproxy::aodh: true
- tripleo::haproxy::gnocchi: true
- tripleo::haproxy::heat_api: true
- tripleo::haproxy::heat_cloudwatch: true
- tripleo::haproxy::heat_cfn: true
- tripleo::haproxy::horizon: true
- tripleo::haproxy::ironic: true
+ tripleo::haproxy::redis: '"%{hiera(\"redis_enabled\")}"'
+ tripleo::haproxy::sahara: '"%{hiera(\"sahara_api_enabled\")}"'
+ tripleo::haproxy::swift_proxy_server: '"%{hiera(\"swift_proxy_enabled\")}"'
+ tripleo::haproxy::ceilometer: '"%{hiera(\"ceilometer_api_enabled\")}"'
+ tripleo::haproxy::aodh: '"%{hiera(\"aodh_api_enabled\")}"'
+ tripleo::haproxy::gnocchi: '"%{hiera(\"gnocchi_api_enabled\")}"'
+ tripleo::haproxy::heat_api: '"%{hiera(\"heat_api_enabled\")}"'
+ tripleo::haproxy::heat_cloudwatch: '"%{hiera(\"heat_api_cloudwatch_enabled\")}"'
+ tripleo::haproxy::heat_cfn: '"%{hiera(\"heat_api_cfn_enabled\")}"'
+ tripleo::haproxy::horizon: '"%{hiera(\"horizon_enabled\")}"'
+ tripleo::haproxy::ironic: '"%{hiera(\"ironic_api_enabled\")}"'
tripleo::haproxy::haproxy_log_address: {get_param: HAProxySyslogAddress}
tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser}
tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword}