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

diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 00574c2f..6885449e 100644
--- a/puppet/services/haproxy.yaml
+++ b/puppet/services/haproxy.yaml
@@ -18,6 +18,32 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  HAProxyStatsPassword:
+    description: Password for HAProxy stats endpoint
+    hidden: true
+    type: string
+  HAProxyStatsUser:
+    description: User for HAProxy stats endpoint
+    default: admin
+    type: string
+  HAProxySyslogAddress:
+    default: /dev/log
+    description: Syslog address where HAproxy will send its log
+    type: string
+  RedisPassword:
+    description: The password for Redis
+    type: string
+    hidden: true
+  ControlVirtualInterface:
+    default: 'br-ex'
+    description: Interface where virtual ip will be assigned.
+    type: string
+  PublicVirtualInterface:
+    default: 'br-ex'
+    description: >
+        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
 
 outputs:
   role_data:
@@ -29,25 +55,32 @@ 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}
+        tripleo::haproxy::redis_password: {get_param: RedisPassword}
+        tripleo::haproxy::control_virtual_interface: {get_param: ControlVirtualInterface}
+        tripleo::haproxy::public_virtual_interface: {get_param: PublicVirtualInterface}
       step_config: |
         include ::tripleo::profile::base::haproxy