Merge "Add parameters for Barbican worker image"

docker/services/barbican-api.yaml

@@ -13,6 +13,9 @@ parameters:
   DockerBarbicanKeystoneListenerImage:
     description: image
     type: string
+  DockerBarbicanWorkerImage:
+    description: image
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -111,6 +114,13 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+        /var/lib/kolla/config_files/barbican_worker.json:
+          command: /usr/bin/barbican-worker
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
       docker_config:
         # db sync runs before permissions set by kolla_config
         step_2:
@@ -140,6 +150,7 @@ outputs:
                 - "'"
         step_4:
           barbican_api:
+            start_order: 0
             image: *barbican_api_image
             net: host
             privileged: false
@@ -165,6 +176,7 @@ outputs:
             environment: &kolla_env
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           barbican_keystone_listener:
+            start_order: 1
             image: {get_param: DockerBarbicanKeystoneListenerImage}
             net: host
             privileged: false
@@ -178,6 +190,21 @@ outputs:
                   - /var/lib/kolla/config_files/barbican_keystone_listener.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro
             environment: *kolla_env
+          barbican_worker:
+            start_order: 2
+            image: {get_param: DockerBarbicanWorkerImage}
+            net: host
+            privileged: false
+            restart: always
+            user: barbican
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                - {get_attr: [BarbicanApiLogging, volumes]}
+                -
+                  - /var/lib/kolla/config_files/barbican_worker.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/puppet-generated/barbican/:/var/lib/kolla/config_files/src:ro
+            environment: *kolla_env
       host_prep_tasks: {get_attr: [BarbicanApiLogging, host_prep_tasks]}
       upgrade_tasks:
         - name: Check if openstack-barbican-api is deployed