aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/neutron-dhcp.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-19 10:54:36 +0000
committerGerrit Code Review <review@openstack.org>2017-04-19 10:54:36 +0000
commit431bc8109a0233ddd915374a9d0f19da76754352 (patch)
tree278e7ef43c05742afc20f930027a6526dbef9afe /docker/services/neutron-dhcp.yaml
parent1ecf50207bbc15005c590b0e7cd3e0266e60c94b (diff)
parente81ddeb685f494bfcfa592212fe8d44c9cc55862 (diff)
Merge "Introduce common resources for docker templates"
Diffstat (limited to 'docker/services/neutron-dhcp.yaml')
-rw-r--r--docker/services/neutron-dhcp.yaml18
1 files changed, 12 insertions, 6 deletions
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index 03fbf766..e48f53b4 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -34,6 +34,9 @@ parameters:
resources:
+ ContainersCommon:
+ type: ./containers-common.yaml
+
NeutronBase:
type: ../../puppet/services/neutron-dhcp.yaml
properties:
@@ -76,12 +79,15 @@ outputs:
privileged: true
restart: always
volumes:
- - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- - /etc/localtime:/etc/localtime:ro
- - /etc/hosts:/etc/hosts:ro
- - /lib/modules:/lib/modules:ro
- - /run/:/run
+ yaql:
+ expression: $.data.common.concat($.data.service)
+ data:
+ common: {get_attr: [ContainersCommon, volumes]}
+ service:
+ - /var/lib/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
+ - /lib/modules:/lib/modules:ro
+ - /run/:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks: