openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Juan Antonio Osorio Robles 2017-04-25 10:55:25 +03:00
parent 746c4d264d
commit c7471e7503
35 changed files with 477 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/services/aodh-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized aodh service OpenStack containerized aodh service
@ -86,11 +86,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- logs:/var/log - logs:/var/log
command: /usr/bin/aodh-dbsync command: /usr/bin/aodh-dbsync
@ -101,11 +99,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/aodh-api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- /var/lib/config-data/aodh/etc/httpd/:/etc/httpd/:ro - /var/lib/config-data/aodh/etc/httpd/:/etc/httpd/:ro

10
docker/services/aodh-evaluator.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Aodh Evaluator service OpenStack containerized Aodh Evaluator service
@ -70,11 +70,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/aodh-evaluator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
environment: environment:

10
docker/services/aodh-listener.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Aodh Listener service OpenStack containerized Aodh Listener service
@ -70,11 +70,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/aodh-listener.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/aodh-listener.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
environment: environment:

10
docker/services/aodh-notifier.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Aodh Notifier service OpenStack containerized Aodh Notifier service
@ -70,11 +70,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/aodh-notifier.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/aodh-notifier.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
environment: environment:

10
docker/services/glance-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack Glance service configured with Puppet OpenStack Glance service configured with Puppet
@ -71,11 +71,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: &glance_volumes volumes: &glance_volumes
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json
- /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro - /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

18
docker/services/gnocchi-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized gnocchi service OpenStack containerized gnocchi service
@ -86,11 +86,9 @@ outputs:
detach: false detach: false
privileged: false privileged: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- logs:/var/log - logs:/var/log
command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"] command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"]
@ -101,11 +99,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro - /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro

10
docker/services/gnocchi-metricd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Gnocchi Metricd service OpenStack containerized Gnocchi Metricd service
@ -68,11 +68,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/gnocchi-metricd.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/gnocchi-metricd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
environment: environment:

10
docker/services/gnocchi-statsd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Gnocchi Statsd service OpenStack containerized Gnocchi Statsd service
@ -68,11 +68,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/gnocchi-statsd.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
environment: environment:

10
docker/services/heat-api-cfn.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Heat API CFN service OpenStack containerized Heat API CFN service
@ -80,11 +80,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/heat_api_cfn.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
- /dev:/dev - /dev:/dev

10
docker/services/heat-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Heat API service OpenStack containerized Heat API service
@ -80,11 +80,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
- /dev:/dev - /dev:/dev

18
docker/services/heat-engine.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Heat Engine service OpenStack containerized Heat Engine service
@ -72,11 +72,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
command: ['heat-manage', 'db_sync'] command: ['heat-manage', 'db_sync']
step_4: step_4:
@ -86,11 +84,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/heat_engine.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
- /run:/run - /run:/run

18
docker/services/ironic-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Ironic API service OpenStack containerized Ironic API service
@ -77,11 +77,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/ironic/etc/:/etc/:ro - /var/lib/config-data/ironic/etc/:/etc/:ro
command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf'] command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf']
step_4: step_4:
@ -92,11 +90,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/etc/:/etc/:ro - /var/lib/config-data/ironic/etc/:/etc/:ro
environment: environment:

10
docker/services/ironic-conductor.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Ironic Conductor service OpenStack containerized Ironic Conductor service
@ -90,11 +90,9 @@ outputs:
privileged: true privileged: true
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
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/kolla/config_files/ironic_conductor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

18
docker/services/ironic-pxe.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Ironic PXE service OpenStack containerized Ironic PXE service
@ -70,11 +70,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
# TODO(mandre) check how docker like mounting in a bind-mounted tree # TODO(mandre) check how docker like mounting in a bind-mounted tree
@ -97,11 +95,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
- /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro - /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro

10
docker/services/keystone.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Keystone service OpenStack containerized Keystone service
@ -99,11 +99,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: &keystone_volumes volumes: &keystone_volumes
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/keystone.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/keystone/var/www/:/var/www/:ro - /var/lib/config-data/keystone/var/www/:/var/www/:ro
- /var/lib/config-data/keystone/etc/keystone/:/etc/keystone/:ro - /var/lib/config-data/keystone/etc/keystone/:/etc/keystone/:ro

10
docker/services/memcached.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Memcached services OpenStack containerized Memcached services
@ -66,11 +66,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro - /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS'] command: ['/bin/bash', '-c', 'source /etc/sysconfig/memcached; /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS']
environment: environment:

26
docker/services/mistral-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Mistral API service OpenStack containerized Mistral API service
@ -78,11 +78,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/mistral/etc/:/etc/:ro - /var/lib/config-data/mistral/etc/:/etc/:ro
command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'upgrade', 'head'] command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'upgrade', 'head']
mistral_db_populate: mistral_db_populate:
@ -92,11 +90,9 @@ outputs:
privileged: false privileged: false
detach: false detach: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/mistral/etc/:/etc/:ro - /var/lib/config-data/mistral/etc/:/etc/:ro
# NOTE: dprince this requires that we install openstack-tripleo-common into # NOTE: dprince this requires that we install openstack-tripleo-common into
# the Mistral API image so that we get tripleo* actions # the Mistral API image so that we get tripleo* actions
@ -109,11 +105,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
environment: environment:

10
docker/services/mistral-engine.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Mistral Engine service OpenStack containerized Mistral Engine service
@ -78,11 +78,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /run:/run - /run:/run
- /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro

10
docker/services/mistral-executor.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Mistral Executor service OpenStack containerized Mistral Executor service
@ -78,11 +78,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
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/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
- /run:/run - /run:/run

18
docker/services/neutron-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Neutron API service OpenStack containerized Neutron API service
@ -81,11 +81,9 @@ outputs:
# and run as neutron user # and run as neutron user
user: root user: root
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro
- /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro
command: ['neutron-db-manage', 'upgrade', 'heads'] command: ['neutron-db-manage', 'upgrade', 'heads']
@ -96,11 +94,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
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/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
environment: environment:

10
docker/services/neutron-dhcp.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Neutron DHCP service OpenStack containerized Neutron DHCP service
@ -79,11 +79,9 @@ outputs:
privileged: true privileged: true
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
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/kolla/config_files/neutron_dhcp.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

10
docker/services/neutron-l3.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Neutron L3 agent OpenStack containerized Neutron L3 agent
@ -75,11 +75,9 @@ outputs:
privileged: true privileged: true
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/neutron-l3-agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

10
docker/services/neutron-ovs-agent.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack Neutron openvswitch service OpenStack Neutron openvswitch service
@ -67,11 +67,9 @@ outputs:
privileged: true privileged: true
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/neutron-openvswitch-agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

10
docker/services/nova-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Nova API service OpenStack containerized Nova API service
@ -129,11 +129,9 @@ outputs:
privileged: true privileged: true
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
environment: environment:

10
docker/services/nova-compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Nova Compute service OpenStack containerized Nova Compute service
@ -76,11 +76,9 @@ outputs:
user: root user: root
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
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/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 - /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
- /dev:/dev - /dev:/dev

10
docker/services/nova-conductor.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Nova Conductor service OpenStack containerized Nova Conductor service
@ -76,11 +76,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova_conductor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
- /run:/run - /run:/run

10
docker/services/nova-ironic.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Nova Ironic Compute service OpenStack containerized Nova Ironic Compute service
@ -72,11 +72,9 @@ outputs:
user: root user: root
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
- /run:/run - /run:/run

10
docker/services/nova-libvirt.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack Libvirt Service OpenStack Libvirt Service
@ -84,11 +84,9 @@ outputs:
privileged: true privileged: true
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro - /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

10
docker/services/nova-placement.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Nova Placement API service OpenStack containerized Nova Placement API service
@ -73,11 +73,9 @@ outputs:
user: root user: root
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
- /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro

10
docker/services/nova-scheduler.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Nova Scheduler service OpenStack containerized Nova Scheduler service
@ -75,11 +75,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/nova_scheduler.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
- /run:/run - /run:/run

18
docker/services/panko-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack Panko service configured with docker OpenStack Panko service configured with docker
@ -86,11 +86,9 @@ outputs:
detach: false detach: false
privileged: false privileged: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/panko/etc/panko:/etc/panko:ro - /var/lib/config-data/panko/etc/panko:/etc/panko:ro
- logs:/var/log - logs:/var/log
command: /usr/bin/panko-dbsync command: /usr/bin/panko-dbsync
@ -102,11 +100,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/panko-api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/panko/etc/panko/:/etc/panko/:ro - /var/lib/config-data/panko/etc/panko/:/etc/panko/:ro
- /var/lib/config-data/panko/etc/httpd/:/etc/httpd/:ro - /var/lib/config-data/panko/etc/httpd/:/etc/httpd/:ro

18
docker/services/rabbitmq.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Rabbitmq service OpenStack containerized Rabbitmq service
@ -78,11 +78,9 @@ outputs:
net: host net: host
privileged: false privileged: false
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq - /var/lib/rabbitmq:/var/lib/rabbitmq
@ -107,11 +105,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq - /var/lib/rabbitmq:/var/lib/rabbitmq

10
docker/services/swift-proxy.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized swift proxy service OpenStack containerized swift proxy service
@ -68,11 +68,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
# FIXME I'm mounting /etc/swift as rw. Are the rings written to # FIXME I'm mounting /etc/swift as rw. Are the rings written to
# at all during runtime? # at all during runtime?

106
docker/services/swift-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Swift Storage services. OpenStack containerized Swift Storage services.
@ -117,11 +117,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -135,11 +133,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -152,11 +148,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -169,11 +163,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -189,11 +181,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -206,11 +196,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -223,11 +211,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -240,11 +226,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -260,11 +244,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -277,11 +259,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -294,11 +274,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -311,11 +289,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run
@ -328,11 +304,9 @@ outputs:
user: swift user: swift
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run - /run:/run

18
docker/services/zaqar.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: pike
description: > description: >
OpenStack containerized Zaqar services OpenStack containerized Zaqar services
@ -70,11 +70,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
environment: environment:
@ -85,11 +83,9 @@ outputs:
privileged: false privileged: false
restart: always restart: always
volumes: volumes:
yaql: list_concat:
expression: $.data.common.concat($.data.service) - {get_attr: [ContainersCommon, volumes]}
data: -
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
environment: environment: