Cleanup haproxy service from explicit services enablement

Change-Id: Ibc86d4dd0aa576345e3f174ea1adca3e6248e81e
Depends-On: I5c620ba717f782b39c599aff24b4ac56fb695a04

diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 6885449..691540a 100644 (file)
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -54,28 +54,6 @@ outputs:
         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}

diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index 64dd766..d2ee036 100644 (file)
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -75,7 +75,6 @@ outputs:
         opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
         opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
         opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpenDaylightApiNetwork]}
-        tripleo::haproxy::opendaylight: true
       step_config: |
         include tripleo::profile::base::neutron::opendaylight
         include tripleo::profile::base::neutron::plugins::ovs::opendaylight