aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/ironic-conductor.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-03 10:43:45 +0000
committerGerrit Code Review <review@openstack.org>2017-05-03 10:43:45 +0000
commit9697f70dcbbb30882bf8cb90f9dd0bcfc35f087f (patch)
tree77fb13e1ec4873793c0aea2ee047bb2e273fc46b /docker/services/ironic-conductor.yaml
parente5b3b671eb82abeb8f4bae9bbf7df1d923439656 (diff)
parentc7471e7503a61ed6895ac6ce92ca48afd225343b (diff)
Merge "Move containers common volumes from yaql to list_concat"
Diffstat (limited to 'docker/services/ironic-conductor.yaml')
-rw-r--r--docker/services/ironic-conductor.yaml24
1 files changed, 11 insertions, 13 deletions
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index 1e1316f3..99d67e04 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
description: >
OpenStack containerized Ironic Conductor service
@@ -90,18 +90,16 @@ outputs:
privileged: true
restart: always
volumes:
- yaql:
- expression: $.data.common.concat($.data.service)
- data:
- common: {get_attr: [ContainersCommon, volumes]}
- service:
- - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
- - /lib/modules:/lib/modules:ro
- - /sys:/sys
- - /dev:/dev
- - /run:/run #shared?
- - /var/lib/ironic:/var/lib/ironic
+ list_concat:
+ - {get_attr: [ContainersCommon, volumes]}
+ -
+ - /var/lib/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+ - /lib/modules:/lib/modules:ro
+ - /sys:/sys
+ - /dev:/dev
+ - /run:/run #shared?
+ - /var/lib/ironic:/var/lib/ironic
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: