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
parent
746c4d264d
commit
c7471e7503
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized aodh service
|
||||
|
|
@ -86,11 +86,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
|
||||
- logs:/var/log
|
||||
command: /usr/bin/aodh-dbsync
|
||||
|
|
@ -101,11 +99,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Aodh Evaluator service
|
||||
|
|
@ -70,11 +70,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Aodh Listener service
|
||||
|
|
@ -70,11 +70,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Aodh Notifier service
|
||||
|
|
@ -70,11 +70,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack Glance service configured with Puppet
|
||||
|
|
@ -71,11 +71,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes: &glance_volumes
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized gnocchi service
|
||||
|
|
@ -86,11 +86,9 @@ outputs:
|
|||
detach: false
|
||||
privileged: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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"]
|
||||
|
|
@ -101,11 +99,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Gnocchi Metricd service
|
||||
|
|
@ -68,11 +68,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Gnocchi Statsd service
|
||||
|
|
@ -68,11 +68,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Heat API CFN service
|
||||
|
|
@ -80,11 +80,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Heat API service
|
||||
|
|
@ -80,11 +80,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Heat Engine service
|
||||
|
|
@ -72,11 +72,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
|
||||
command: ['heat-manage', 'db_sync']
|
||||
step_4:
|
||||
|
|
@ -86,11 +84,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Ironic API service
|
||||
|
|
@ -77,11 +77,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
@ -92,11 +90,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Ironic Conductor service
|
||||
|
|
@ -90,11 +90,9 @@ outputs:
|
|||
privileged: true
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Ironic PXE service
|
||||
|
|
@ -70,11 +70,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -97,11 +95,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Keystone service
|
||||
|
|
@ -99,11 +99,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes: &keystone_volumes
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Memcached services
|
||||
|
|
@ -66,11 +66,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Mistral API service
|
||||
|
|
@ -78,11 +78,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
@ -92,11 +90,9 @@ outputs:
|
|||
privileged: false
|
||||
detach: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -109,11 +105,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Mistral Engine service
|
||||
|
|
@ -78,11 +78,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Mistral Executor service
|
||||
|
|
@ -78,11 +78,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Neutron API service
|
||||
|
|
@ -81,11 +81,9 @@ outputs:
|
|||
# and run as neutron user
|
||||
user: root
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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']
|
||||
|
|
@ -96,11 +94,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Neutron DHCP service
|
||||
|
|
@ -79,11 +79,9 @@ outputs:
|
|||
privileged: true
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Neutron L3 agent
|
||||
|
|
@ -75,11 +75,9 @@ outputs:
|
|||
privileged: true
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack Neutron openvswitch service
|
||||
|
|
@ -67,11 +67,9 @@ outputs:
|
|||
privileged: true
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Nova API service
|
||||
|
|
@ -129,11 +129,9 @@ outputs:
|
|||
privileged: true
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Nova Compute service
|
||||
|
|
@ -76,11 +76,9 @@ outputs:
|
|||
user: root
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Nova Conductor service
|
||||
|
|
@ -76,11 +76,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Nova Ironic Compute service
|
||||
|
|
@ -72,11 +72,9 @@ outputs:
|
|||
user: root
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack Libvirt Service
|
||||
|
|
@ -84,11 +84,9 @@ outputs:
|
|||
privileged: true
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Nova Placement API service
|
||||
|
|
@ -73,11 +73,9 @@ outputs:
|
|||
user: root
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Nova Scheduler service
|
||||
|
|
@ -75,11 +75,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack Panko service configured with docker
|
||||
|
|
@ -86,11 +86,9 @@ outputs:
|
|||
detach: false
|
||||
privileged: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/config-data/panko/etc/panko:/etc/panko:ro
|
||||
- logs:/var/log
|
||||
command: /usr/bin/panko-dbsync
|
||||
|
|
@ -102,11 +100,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Rabbitmq service
|
||||
|
|
@ -78,11 +78,9 @@ outputs:
|
|||
net: host
|
||||
privileged: false
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -107,11 +105,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized swift proxy service
|
||||
|
|
@ -68,11 +68,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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?
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Swift Storage services.
|
||||
|
|
@ -117,11 +117,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -135,11 +133,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -152,11 +148,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -169,11 +163,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -189,11 +181,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -206,11 +196,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -223,11 +211,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -240,11 +226,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -260,11 +244,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -277,11 +259,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -294,11 +274,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -311,11 +289,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
@ -328,11 +304,9 @@ outputs:
|
|||
user: swift
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
heat_template_version: ocata
|
||||
heat_template_version: pike
|
||||
|
||||
description: >
|
||||
OpenStack containerized Zaqar services
|
||||
|
|
@ -70,11 +70,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
@ -85,11 +83,9 @@ outputs:
|
|||
privileged: false
|
||||
restart: always
|
||||
volumes:
|
||||
yaql:
|
||||
expression: $.data.common.concat($.data.service)
|
||||
data:
|
||||
common: {get_attr: [ContainersCommon, volumes]}
|
||||
service:
|
||||
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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue