openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Cleanup haproxy service from explicit services enablement"

This commit is contained in:
Jenkins 2016-09-06 15:33:52 +00:00 committed by Gerrit Code Review
parent 61ca8799d9 db419ec8f9
commit 5124693c0e
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
puppet/services/haproxy.yaml
View File

@ -58,28 +58,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}

1
puppet/services/opendaylight-api.yaml
View File

@ -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