openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Move containers common volumes from yaql to list_concat"

Browse Source
This commit is contained in:
Jenkins 2017-05-03 10:43:45 +00:00 committed by Gerrit Code Review
commit 9697f70dcb
35 changed files with 477 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized aodh service
@ -86,13 +86,11 @@ outputs:
privileged: false
detach: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- logs:/var/log
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- logs:/var/log
command: /usr/bin/aodh-dbsync
step_4:
aodh_api:
@ -101,26 +99,24 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/aodh/etc/aodh/:/etc/aodh/:ro
- /var/lib/config-data/aodh/etc/httpd/:/etc/httpd/:ro
- /var/lib/config-data/aodh/var/www/:/var/www/:ro
- logs:/var/log
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/httpd/:/etc/httpd/:ro
- /var/lib/config-data/aodh/var/www/:/var/www/:ro
- logs:/var/log
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Aodh Evaluator service
@ -70,13 +70,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/aodh/etc/aodh/:/etc/aodh/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Aodh Listener service
@ -70,13 +70,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/aodh/etc/aodh/:/etc/aodh/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Aodh Notifier service
@ -70,13 +70,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/aodh/etc/aodh/:/etc/aodh/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack Glance service configured with Puppet
@ -71,16 +71,14 @@ outputs:
privileged: false
detach: false
volumes: &glance_volumes
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /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
- /lib/modules:/lib/modules:ro
- /run:/run
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /lib/modules:/lib/modules:ro
- /run:/run
- /dev:/dev
environment:
- KOLLA_BOOTSTRAP=True
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized gnocchi service
@ -86,13 +86,11 @@ outputs:
detach: false
privileged: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- logs:/var/log
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- logs:/var/log
command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"]
step_4:
gnocchi_api:
@ -101,25 +99,23 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
- /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro
- /var/lib/config-data/gnocchi/var/www/:/var/www/:ro
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/httpd/:/etc/httpd/:ro
- /var/lib/config-data/gnocchi/var/www/:/var/www/:ro
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Gnocchi Metricd service
@ -68,13 +68,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Gnocchi Statsd service
@ -68,13 +68,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Heat API CFN service
@ -80,15 +80,13 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/heat/etc/heat/:/etc/heat/:ro
- /dev:/dev
- /run:/run
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /dev:/dev
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Heat API service
@ -80,15 +80,13 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/heat/etc/heat/:/etc/heat/:ro
- /dev:/dev
- /run:/run
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /dev:/dev
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Heat Engine service
@ -72,12 +72,10 @@ outputs:
privileged: false
detach: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
command: ['heat-manage', 'db_sync']
step_4:
heat_engine:
@ -86,14 +84,12 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/heat/etc/heat/:/etc/heat/:ro
- /run:/run
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

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

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

@ -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:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Ironic PXE service
@ -70,24 +70,22 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/ironic/etc/ironic/:/etc/ironic/:ro
# TODO(mandre) check how docker like mounting in a bind-mounted tree
# This directory may contain migrated data from BM
- /var/lib/ironic:/var/lib/ironic/
# These files were generated by puppet inside the config container
# TODO(mandre) check the mount permission (ro/rw)
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/ipxe.efi:/var/lib/ironic/tftpboot/ipxe.efi
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/undionly.kpxe:/var/lib/ironic/tftpboot/undionly.kpxe
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/map-file:/var/lib/ironic/tftpboot/map-file
- /dev/log:/dev/log
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
# TODO(mandre) check how docker like mounting in a bind-mounted tree
# This directory may contain migrated data from BM
- /var/lib/ironic:/var/lib/ironic/
# These files were generated by puppet inside the config container
# TODO(mandre) check the mount permission (ro/rw)
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/ipxe.efi:/var/lib/ironic/tftpboot/ipxe.efi
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/undionly.kpxe:/var/lib/ironic/tftpboot/undionly.kpxe
- /var/lib/config-data/ironic/var/lib/ironic/tftpboot/map-file:/var/lib/ironic/tftpboot/map-file
- /dev/log:/dev/log
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
ironic_pxe_http:
@ -97,15 +95,13 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/ironic/etc/ironic/:/etc/ironic/:ro
- /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro
- /var/lib/ironic:/var/lib/ironic/
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/httpd/:/etc/httpd/:ro
- /var/lib/ironic:/var/lib/ironic/
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:

40
docker/services/keystone.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Keystone service
@ -99,26 +99,24 @@ outputs:
privileged: false
detach: false
volumes: &keystone_volumes
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /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/etc/keystone/:/etc/keystone/:ro
- /var/lib/config-data/keystone/etc/httpd/:/etc/httpd/:ro
- logs:/var/log
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/etc/keystone/:/etc/keystone/:ro
- /var/lib/config-data/keystone/etc/httpd/:/etc/httpd/:ro
- logs:/var/log
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
environment:
- KOLLA_BOOTSTRAP=True
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

12
docker/services/memcached.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Memcached services
@ -66,12 +66,10 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/memcached/etc/sysconfig/memcached:/etc/sysconfig/memcached:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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']
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Mistral API service
@ -78,12 +78,10 @@ outputs:
privileged: false
detach: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/mistral/etc/:/etc/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/mistral/etc/:/etc/:ro
command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'upgrade', 'head']
mistral_db_populate:
start_order: 2
@ -92,12 +90,10 @@ outputs:
privileged: false
detach: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/mistral/etc/:/etc/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/mistral/etc/:/etc/:ro
# NOTE: dprince this requires that we install openstack-tripleo-common into
# the Mistral API image so that we get tripleo* actions
command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'populate']
@ -109,13 +105,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/mistral/etc/mistral/:/etc/mistral/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Mistral Engine service
@ -78,14 +78,12 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /run:/run
- /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
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /run:/run
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Mistral Executor service
@ -78,18 +78,16 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/mistral/etc/mistral/:/etc/mistral/:ro
- /run:/run
# FIXME: this is required in order for Nova cells
# initialization workflows on the Undercloud. Need to
# exclude this on the overcloud for security reasons.
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
# FIXME: this is required in order for Nova cells
# initialization workflows on the Undercloud. Need to
# exclude this on the overcloud for security reasons.
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Neutron API service
@ -81,13 +81,11 @@ outputs:
# and run as neutron user
user: root
volumes:
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
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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:
@ -96,13 +94,11 @@ outputs:
privileged: false
restart: always
volumes:
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
list_concat:
- {get_attr: [ContainersCommon, 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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Neutron DHCP service
@ -79,15 +79,13 @@ 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/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
list_concat:
- {get_attr: [ContainersCommon, 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
- /lib/modules:/lib/modules:ro
- /run/:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Neutron L3 agent
@ -75,14 +75,12 @@ 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/neutron-l3-agent.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
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /lib/modules:/lib/modules:ro
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack Neutron openvswitch service
@ -67,15 +67,13 @@ 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/neutron-openvswitch-agent.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
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /lib/modules:/lib/modules:ro
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova API service
@ -129,13 +129,11 @@ 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/nova_api.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
step_5:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova Compute service
@ -76,19 +76,17 @@ outputs:
user: root
restart: always
volumes:
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
list_concat:
- {get_attr: [ContainersCommon, 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
- /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:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova Conductor service
@ -76,14 +76,12 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/nova/etc/nova/:/etc/nova/:ro
- /run:/run
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova Ironic Compute service
@ -72,17 +72,15 @@ outputs:
user: root
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/nova/etc/nova/:/etc/nova/:ro
- /run:/run
- /dev:/dev
- /etc/iscsi:/etc/iscsi
- /var/lib/nova/:/var/lib/nova
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /dev:/dev
- /etc/iscsi:/etc/iscsi
- /var/lib/nova/:/var/lib/nova
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack Libvirt Service
@ -84,22 +84,20 @@ 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/nova-libvirt.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/nova_libvirt/etc/libvirt/:/etc/libvirt/:ro
- /lib/modules:/lib/modules:ro
- /dev:/dev
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /var/lib/nova:/var/lib/nova
# Needed to use host's virtlogd
- /var/run/libvirt:/var/run/libvirt
- /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /lib/modules:/lib/modules:ro
- /dev:/dev
- /run:/run
- /sys/fs/cgroup:/sys/fs/cgroup
- /var/lib/nova:/var/lib/nova
# Needed to use host's virtlogd
- /var/run/libvirt:/var/run/libvirt
- /var/lib/libvirt:/var/lib/libvirt
- /etc/libvirt/qemu:/etc/libvirt/qemu
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova Placement API service
@ -73,15 +73,13 @@ outputs:
user: root
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/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/var/www/:/var/www/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/httpd/:/etc/httpd/:ro
- /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova Scheduler service
@ -75,14 +75,12 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/nova/etc/nova/:/etc/nova/:ro
- /run:/run
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack Panko service configured with docker.
@ -88,13 +88,11 @@ outputs:
detach: false
privileged: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /var/lib/config-data/panko/etc/panko:/etc/panko:ro
- logs:/var/log
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/panko/etc/panko:/etc/panko:ro
- logs:/var/log
command: /usr/bin/panko-dbsync
step_4:
panko_api:
@ -104,25 +102,23 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/panko/etc/panko/:/etc/panko/:ro
- /var/lib/config-data/panko/etc/httpd/:/etc/httpd/:ro
- /var/lib/config-data/panko/var/www/:/var/www/:ro
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/httpd/:/etc/httpd/:ro
- /var/lib/config-data/panko/var/www/:/var/www/:ro
-
if:
- internal_tls_enabled
- /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
- ''
-
if:
- internal_tls_enabled
- /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
- ''
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
metadata_settings:

30
docker/services/rabbitmq.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Rabbitmq service
@ -78,14 +78,12 @@ outputs:
net: host
privileged: false
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /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/rabbitmq:/var/lib/rabbitmq
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/rabbitmq:/var/lib/rabbitmq
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- KOLLA_BOOTSTRAP=True
@ -107,14 +105,12 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /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/rabbitmq:/var/lib/rabbitmq
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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/rabbitmq:/var/lib/rabbitmq
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
docker_puppet_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized swift proxy service
@ -68,18 +68,16 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /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
# at all during runtime?
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
# at all during runtime?
- /var/lib/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Swift Storage services.
@ -117,16 +117,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: &kolla_env
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
swift_account_reaper:
@ -135,16 +133,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_account_replicator:
image: *swift_account_image
@ -152,16 +148,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_account_server:
image: *swift_account_image
@ -169,16 +163,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_auditor:
image: &swift_container_image
@ -189,16 +181,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_replicator:
image: *swift_container_image
@ -206,16 +196,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_updater:
image: *swift_container_image
@ -223,16 +211,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_container_server:
image: *swift_container_image
@ -240,16 +226,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_auditor:
image: &swift_object_image
@ -260,16 +244,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_expirer:
image: *swift_proxy_image
@ -277,16 +259,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_replicator:
image: *swift_object_image
@ -294,16 +274,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_updater:
image: *swift_object_image
@ -311,16 +289,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
swift_object_server:
image: *swift_object_image
@ -328,16 +304,14 @@ outputs:
user: swift
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/swift/etc/swift:/etc/swift:rw
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
environment: *kolla_env
host_prep_tasks:
- name: create /srv/node

26
docker/services/zaqar.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Zaqar services
@ -70,13 +70,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
data:
common: {get_attr: [ContainersCommon, volumes]}
service:
- /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
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
zaqar_websocket:
@ -85,13 +83,11 @@ outputs:
privileged: false
restart: always
volumes:
yaql:
expression: $.data.common.concat($.data.service)
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/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /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
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
upgrade_tasks: