Merge "Remove package if service stopped and disabled" into stable/pike

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

diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index e2d84bf..e00f6bb 100644 (file)
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@@ -15,6 +15,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -33,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -43,6 +46,7 @@ resources:
     type: ../../puppet/services/octavia-worker.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -54,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaWorkerPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]}