X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fhaproxy.yaml;h=6885449e83d559477a9229e7b043bbef51d35807;hb=685c1e7de0c5a37d6f11eeb9bceaa74b0a2e923a;hp=8ac669a97b6d714319302b62ba6331a9e9767e0b;hpb=213099a681a2649612adc7f6df6c37d40c47a8e6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 8ac669a9..6885449e 100644
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -55,26 +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::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}