Merge "Use a single configuration file for specifying docker containers."

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

diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index bc91ec2..21baf5c 100644 (file)
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -10,6 +10,10 @@ parameters:
   DockerHAProxyConfigImage:
     description: The container image to use for the haproxy config_volume
     type: string
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -66,6 +70,7 @@ resources:
     type: ../../puppet/services/haproxy.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}