Merge "Add constraint to prohibit balance-tcp from BondInterfaceOvsOptions"

[apex-tripleo-heat-templates.git] / puppet / services / haproxy.yaml

diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 6885449..974928c 100644 (file)
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -44,38 +44,20 @@ parameters:
         Specifies the interface where the public-facing virtual ip will be assigned.
         This should be int_public when a VLAN is being used.
     type: string
+  MonitoringSubscriptionHaproxy:
+    default: 'overcloud-haproxy'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the HAproxy role.
     value:
       service_name: haproxy
+      monitoring_subscription: {get_param: MonitoringSubscriptionHaproxy}
       config_settings:
         tripleo.haproxy.firewall_rules:
           '107 haproxy stats':
             dport: 1993
-        # TODO(emilien) make it composable to find which services are actually running
-        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: '"%{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}