diff options
author | 2017-04-19 10:54:36 +0000 | |
---|---|---|
committer | 2017-04-19 10:54:36 +0000 | |
commit | 431bc8109a0233ddd915374a9d0f19da76754352 (patch) | |
tree | 278e7ef43c05742afc20f930027a6526dbef9afe /docker/services/neutron-api.yaml | |
parent | 1ecf50207bbc15005c590b0e7cd3e0266e60c94b (diff) | |
parent | e81ddeb685f494bfcfa592212fe8d44c9cc55862 (diff) |
Merge "Introduce common resources for docker templates"
Diffstat (limited to 'docker/services/neutron-api.yaml')
-rw-r--r-- | docker/services/neutron-api.yaml | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index c5001a30..00b1f857 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -34,6 +34,9 @@ parameters: resources: + ContainersCommon: + type: ./containers-common.yaml + NeutronBase: type: ../../puppet/services/neutron-api.yaml properties: @@ -78,10 +81,13 @@ outputs: # and run as neutron user user: root volumes: - - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro - - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro - - /etc/hosts:/etc/hosts:ro - - /etc/localtime:/etc/localtime:ro + yaql: + expression: $.data.common.concat($.data.service) + data: + common: {get_attr: [ContainersCommon, volumes]} + service: + - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro + - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro command: ['neutron-db-manage', 'upgrade', 'heads'] step_4: neutron_api: @@ -90,10 +96,13 @@ outputs: privileged: false restart: always volumes: - - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro - - /etc/hosts:/etc/hosts:ro - - /etc/localtime:/etc/localtime:ro + yaql: + expression: $.data.common.concat($.data.service) + data: + common: {get_attr: [ContainersCommon, volumes]} + service: + - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS upgrade_tasks: |