aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/mistral-executor.yaml
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-04-25 10:55:25 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-05-02 15:00:34 +0300
commitc7471e7503a61ed6895ac6ce92ca48afd225343b (patch)
treec49024621184700ebca09ff8ac92446aab91ea8d /docker/services/mistral-executor.yaml
parent746c4d264d4f8d441876c9f248493bc3cc9f60fe (diff)
Move containers common volumes from yaql to list_concat
list_concat was introduced recently and is able to replace the yaql calls for concatenating lists. Change-Id: Id3a80a0e1e4c25b6d838898757c69ec99d0cd826
Diffstat (limited to 'docker/services/mistral-executor.yaml')
-rw-r--r--docker/services/mistral-executor.yaml24
1 files changed, 11 insertions, 13 deletions
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 374b0be..9c3bfb3 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
description: >
OpenStack containerized Mistral Executor service
@@ -78,18 +78,16 @@ outputs:
privileged: false
restart: always
volumes:
- yaql:
- expression: $.data.common.concat($.data.service)
- data:
- common: {get_attr: [ContainersCommon, volumes]}
- service:
- - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
- - /run:/run
- # FIXME: this is required in order for Nova cells
- # initialization workflows on the Undercloud. Need to
- # exclude this on the overcloud for security reasons.
- - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
+ list_concat:
+ - {get_attr: [ContainersCommon, volumes]}
+ -
+ - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+ - /run:/run
+ # FIXME: this is required in order for Nova cells
+ # initialization workflows on the Undercloud. Need to
+ # exclude this on the overcloud for security reasons.
+ - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks: