diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-19 10:54:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-19 10:54:36 +0000 |
| commit | 431bc8109a0233ddd915374a9d0f19da76754352 (patch) | |
| tree | 278e7ef43c05742afc20f930027a6526dbef9afe /docker/services/nova-compute.yaml | |
| parent | 1ecf50207bbc15005c590b0e7cd3e0266e60c94b (diff) | |
| parent | e81ddeb685f494bfcfa592212fe8d44c9cc55862 (diff) | |
Merge "Introduce common resources for docker templates"
Diffstat (limited to 'docker/services/nova-compute.yaml')
| -rw-r--r-- | docker/services/nova-compute.yaml | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index fb286ca5..c347b113 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -29,6 +29,8 @@ parameters: resources: + ContainersCommon: + type: ./containers-common.yaml NovaComputeBase: type: ../../puppet/services/nova-compute.yaml @@ -66,15 +68,19 @@ outputs: user: root restart: always volumes: - - /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro - - /dev:/dev - - /etc/iscsi:/etc/iscsi - - /etc/localtime:/etc/localtime:ro - - /lib/modules:/lib/modules:ro - - /run:/run - - /var/lib/nova:/var/lib/nova - - /var/lib/libvirt:/var/lib/libvirt + yaql: + expression: $.data.common.concat($.data.service) + data: + common: {get_attr: [ContainersCommon, volumes]} + service: + - /var/lib/kolla/config_files/nova-compute.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro + - /dev:/dev + - /etc/iscsi:/etc/iscsi + - /lib/modules:/lib/modules:ro + - /run:/run + - /var/lib/nova:/var/lib/nova + - /var/lib/libvirt:/var/lib/libvirt environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS host_prep_tasks: |