Merge "Fix wrong permission on database during mysql_init tasks." into stable/pike

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

diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
index be2c445..64e4f48 100644 (file)
--- a/docker/services/octavia-housekeeping.yaml
+++ b/docker/services/octavia-housekeeping.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack Octavia service configured with Puppet
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerOctaviaHousekeepingImage:
     description: image
-    default: 'centos-binary-octavia-housekeeping:latest'
     type: string
   DockerOctaviaConfigImage:
     description: The container image to use for the octavia config_volume
-    default: 'centos-binary-octavia-api:latest'
     type: string
   EndpointMap:
     default: {}
     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
@@ -39,7 +37,6 @@ parameters:
     description: Parameters specific to the role
     type: json
 
-
 resources:
 
   ContainersCommon:
@@ -49,6 +46,7 @@ resources:
     type: ../../puppet/services/octavia-housekeeping.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -60,6 +58,8 @@ outputs:
     value:
       service_name: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_name]}
       config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, config_settings]}
+      logging_source: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_source]}
+      logging_groups: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
       service_config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]}
@@ -68,10 +68,7 @@ outputs:
         config_volume: octavia
         puppet_tags: octavia_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaConfigImage} ]
+        config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_housekeeping.json:
           command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
@@ -84,10 +81,7 @@ outputs:
         step_2:
           octavia_housekeeping_init_dirs:
             start_order: 0
-            image: &octavia_housekeeping_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ]
+            image: &octavia_housekeeping_image {get_param: DockerOctaviaHousekeepingImage}
             user: root
             volumes:
               # NOTE(mandre) we need extra dir for the service in /etc/octavia/conf.d