diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index 74805691effeaf059d91c08c276bfc09d6ab65ee..9fac5bc0e1f4b1858123b7eb8370483c98b2226e 100644
--- a/ansible/roles/horizon/defaults/main.yml
+++ b/ansible/roles/horizon/defaults/main.yml
@@ -42,6 +42,7 @@ horizon_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "/tmp:/tmp"
+ dimensions: "{{ horizon_dimensions }}"
horizon_keystone_domain_choices:
Default: default
@@ -59,6 +60,7 @@ horizon_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_
horizon_tag: "{{ openstack_release }}"
horizon_image_full: "{{ horizon_image }}:{{ horizon_tag }}"
+horizon_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack
diff --git a/ansible/roles/horizon/handlers/main.yml b/ansible/roles/horizon/handlers/main.yml
index c82a3c3551eca264457f5214a4528a04c8f3d86c..e18fc049218cb6497c2839cfe9a3995e2369e70e 100644
--- a/ansible/roles/horizon/handlers/main.yml
+++ b/ansible/roles/horizon/handlers/main.yml
@@ -11,6 +11,7 @@
image: "{{ service.image }}"
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml
index fc959e92a0a0777ecabfbd90339967cd7956f491..a50ee44b75aabea12c5ec3ff89e853173442d70d 100644
--- a/ansible/roles/horizon/tasks/config.yml
+++ b/ansible/roles/horizon/tasks/config.yml
@@ -144,6 +144,7 @@
image: "{{ horizon.image }}"
environment: "{{ horizon.environment }}"
volumes: "{{ horizon.volumes }}"
+ dimensions: "{{ horizon.dimensions }}"
register: check_horizon_container
when:
- kolla_action != "config"
diff --git a/ansible/roles/influxdb/defaults/main.yml b/ansible/roles/influxdb/defaults/main.yml
index 81e4efffaae6231bb74aee018c3a6935c44e3ced..76f06a80743770df36632145383fea62b7f02d15 100644
--- a/ansible/roles/influxdb/defaults/main.yml
+++ b/ansible/roles/influxdb/defaults/main.yml
@@ -12,6 +12,7 @@ influxdb_services:
- "/etc/localtime:/etc/localtime:ro"
- "influxdb:/var/lib/influxdb"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ influxdb_dimensions }}"
####################
@@ -20,3 +21,4 @@ influxdb_services:
influxdb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-influxdb"
influxdb_tag: "{{ openstack_release }}"
influxdb_image_full: "{{ influxdb_image }}:{{ influxdb_tag }}"
+influxdb_dimensions: "{{ default_container_dimensions }}"
diff --git a/ansible/roles/influxdb/handlers/main.yml b/ansible/roles/influxdb/handlers/main.yml
index 8f900b00da320c06bd41ac25c4232245667ef7bf..2e9bd3bc13a2fff7c997187654b833d97e5720ee 100644
--- a/ansible/roles/influxdb/handlers/main.yml
+++ b/ansible/roles/influxdb/handlers/main.yml
@@ -12,6 +12,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/influxdb/tasks/config.yml b/ansible/roles/influxdb/tasks/config.yml
index 13c35d47bd9e3c0f28b5602b43fbf69251c93df9..91e4ace9333cd2cb8aa1c6c229fec111bbefc07d 100644
--- a/ansible/roles/influxdb/tasks/config.yml
+++ b/ansible/roles/influxdb/tasks/config.yml
@@ -53,6 +53,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_influxdb_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml
index c21b23897ff76658fe9fa0e20fa1833e90ddb9ef..37034d07dc0288a3ff69058037e84e6b589a6259 100644
--- a/ansible/roles/ironic/defaults/main.yml
+++ b/ansible/roles/ironic/defaults/main.yml
@@ -12,6 +12,7 @@ ironic_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
- "{{ kolla_dev_repos_directory ~ '/ironic/ironic:/var/lib/kolla/venv/lib/python2.7/site-packages/ironic' if ironic_dev_mode | bool else '' }}"
+ dimensions: "{{ ironic_api_dimensions }}"
ironic-conductor:
container_name: ironic_conductor
group: ironic-conductor
@@ -30,6 +31,7 @@ ironic_services:
- "ironic_pxe:/tftpboot/"
- "ironic_ipxe:/httpboot/"
- "{{ kolla_dev_repos_directory ~ '/ironic/ironic:/var/lib/kolla/venv/lib/python2.7/site-packages/ironic' if ironic_dev_mode | bool else '' }}"
+ dimensions: "{{ ironic_conductor_dimensions }}"
ironic-inspector:
container_name: ironic_inspector
group: ironic-inspector
@@ -41,6 +43,7 @@ ironic_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
- "{{ kolla_dev_repos_directory ~ '/ironic-inspector/ironic_inspector:/var/lib/kolla/venv/lib/python2.7/site-packages/ironic_inspector' if ironic_dev_mode | bool else '' }}"
+ dimensions: "{{ ironic_inspector_dimensions }}"
ironic-pxe:
container_name: ironic_pxe
group: ironic-pxe
@@ -51,6 +54,7 @@ ironic_services:
- "/etc/localtime:/etc/localtime:ro"
- "ironic_pxe:/tftpboot/"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ ironic_pxe_dimensions }}"
ironic-ipxe:
container_name: ironic_ipxe
group: ironic-ipxe
@@ -61,6 +65,7 @@ ironic_services:
- "/etc/localtime:/etc/localtime:ro"
- "ironic_ipxe:/httpboot/"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ ironic_ipxe_dimensions }}"
ironic-dnsmasq:
container_name: ironic_dnsmasq
group: ironic-inspector
@@ -72,6 +77,7 @@ ironic_services:
- "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ ironic_dnsmasq_dimensions }}"
####################
@@ -112,6 +118,12 @@ ironic_dnsmasq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{
ironic_dnsmasq_tag: "{{ ironic_tag }}"
ironic_dnsmasq_image_full: "{{ ironic_dnsmasq_image }}:{{ ironic_dnsmasq_tag }}"
+ironic_api_dimensions: "{{ default_container_dimensions }}"
+ironic_conductor_dimensions: "{{ default_container_dimensions }}"
+ironic_pxe_dimensions: "{{ default_container_dimensions }}"
+ironic_ipxe_dimensions: "{{ default_container_dimensions }}"
+ironic_inspector_dimensions: "{{ default_container_dimensions }}"
+ironic_dnsmasq_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack
diff --git a/ansible/roles/ironic/handlers/main.yml b/ansible/roles/ironic/handlers/main.yml
index 15ded2fafbd590cc77e5f4670aff9d5e7bbca4be..5fc02543c16323de7492206567236ea35dec7c63 100644
--- a/ansible/roles/ironic/handlers/main.yml
+++ b/ansible/roles/ironic/handlers/main.yml
@@ -15,6 +15,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -39,6 +40,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -63,6 +65,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -85,6 +88,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -107,6 +111,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -130,6 +135,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
cap_add: "{{ service.cap_add }}"
when:
- kolla_action != "config"
diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml
index c1efd18c5af930d122fb032c12b6b58bbf004ea9..0d3627f3576e492b10b8bbd9498a1ee5292a285e 100644
--- a/ansible/roles/ironic/tasks/config.yml
+++ b/ansible/roles/ironic/tasks/config.yml
@@ -260,6 +260,7 @@
privileged: "{{ item.value.privileged|default(False) }}"
cap_add: "{{ item.value.cap_add|default([]) }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_ironic_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/kafka/defaults/main.yml b/ansible/roles/kafka/defaults/main.yml
index ecf13665cb63977e55590b6e173a7abdb474bedf..2eaf6d8a89dec002332a8fb59dc6e7c0c87e55f1 100644
--- a/ansible/roles/kafka/defaults/main.yml
+++ b/ansible/roles/kafka/defaults/main.yml
@@ -13,6 +13,7 @@ kafka_services:
- "/etc/localtime:/etc/localtime:ro"
- "kafka:/var/lib/kafka/data"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ kafka_dimensions }}"
####################
# Kafka
@@ -29,3 +30,4 @@ kafka_install_type: "{{ kolla_install_type }}"
kafka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kafka_install_type }}-kafka"
kafka_tag: "{{ openstack_release }}"
kafka_image_full: "{{ kafka_image }}:{{ kafka_tag }}"
+kafka_dimensions: "{{ default_container_dimensions }}"
diff --git a/ansible/roles/kafka/handlers/main.yml b/ansible/roles/kafka/handlers/main.yml
index fe274b9ae888d386a5026e53fb2f320dc8ff2038..ba71ff36f2227a71a766aaef3fe8c24ec84f683d 100644
--- a/ansible/roles/kafka/handlers/main.yml
+++ b/ansible/roles/kafka/handlers/main.yml
@@ -14,6 +14,7 @@
image: "{{ service.image }}"
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/kafka/tasks/config.yml b/ansible/roles/kafka/tasks/config.yml
index de6a8dc5d038693184665095998a83fb2c86a325..506f7d6a02ae9d2246a095837162dd18746f310f 100644
--- a/ansible/roles/kafka/tasks/config.yml
+++ b/ansible/roles/kafka/tasks/config.yml
@@ -53,6 +53,7 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
environment: "{{ item.value.environment }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_kafka_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/karbor/defaults/main.yml b/ansible/roles/karbor/defaults/main.yml
index 2be3cc6b4ffd0649b2faa90e46b152a344ea9786..aed8e0ef0bec3bc8514ac820bf2a5430a2ccac6c 100644
--- a/ansible/roles/karbor/defaults/main.yml
+++ b/ansible/roles/karbor/defaults/main.yml
@@ -11,6 +11,7 @@ karbor_services:
- "{{ node_config_directory }}/karbor-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ karbor_api_dimensions }}"
karbor-protection:
container_name: karbor_protection
group: karbor-protection
@@ -20,6 +21,7 @@ karbor_services:
- "{{ node_config_directory }}/karbor-protection/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ karbor_protection_dimensions }}"
karbor-operationengine:
container_name: karbor_operationengine
group: karbor-operationengine
@@ -29,6 +31,7 @@ karbor_services:
- "{{ node_config_directory }}/karbor-operationengine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ karbor_operationengine_dimensions }}"
####################
@@ -57,6 +60,10 @@ karbor_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock
karbor_api_tag: "{{ karbor_tag }}"
karbor_api_image_full: "{{ karbor_api_image }}:{{ karbor_api_tag }}"
+karbor_api_dimensions: "{{ default_container_dimensions }}"
+karbor_protection_dimensions: "{{ default_container_dimensions }}"
+karbor_operationengine_dimensions: "{{ default_container_dimensions }}"
+
####################
# OpenStack
diff --git a/ansible/roles/karbor/handlers/main.yml b/ansible/roles/karbor/handlers/main.yml
index 4be0cb95c0a89329eaa69fe3ca94a932121f2879..40a1f4e74a13b4476f43504276286fe73553a931 100644
--- a/ansible/roles/karbor/handlers/main.yml
+++ b/ansible/roles/karbor/handlers/main.yml
@@ -13,6 +13,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -35,6 +36,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -58,6 +60,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/karbor/tasks/config.yml b/ansible/roles/karbor/tasks/config.yml
index 792a4f86ac72873b3e41bf28d574a459a645b5a6..609323b2f0ae8c9e6c2598ad20338308ef6795b3 100644
--- a/ansible/roles/karbor/tasks/config.yml
+++ b/ansible/roles/karbor/tasks/config.yml
@@ -76,6 +76,7 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
mode: "0660"
+ dimensions: "{{ item.value.dimensions }}"
register: check_karbor_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml
index 4f55a40b5606386f7eb1acc76605ad5047dd1d97..4f1af8adc15fa020d19c9940615912cf5860268e 100644
--- a/ansible/roles/keystone/defaults/main.yml
+++ b/ansible/roles/keystone/defaults/main.yml
@@ -13,6 +13,7 @@ keystone_services:
- "{{ kolla_dev_repos_directory ~ '/keystone/keystone:/var/lib/kolla/venv/lib/python2.7/site-packages/keystone' if keystone_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
- "{% if keystone_token_provider == 'fernet' %}keystone_fernet_tokens:/etc/keystone/fernet-keys{% endif %}"
+ dimensions: "{{ keystone_dimensions }}"
keystone-ssh:
container_name: "keystone_ssh"
group: "keystone"
@@ -23,6 +24,7 @@ keystone_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "keystone_fernet_tokens:/etc/keystone/fernet-keys"
+ dimensions: "{{ keystone_ssh_dimensions }}"
keystone-fernet:
container_name: "keystone_fernet"
group: "keystone"
@@ -33,6 +35,7 @@ keystone_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "keystone_fernet_tokens:/etc/keystone/fernet-keys"
+ dimensions: "{{ keystone_fernet_dimensions }}"
####################
@@ -68,6 +71,9 @@ keystone_ssh_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ do
keystone_ssh_tag: "{{ keystone_tag }}"
keystone_ssh_image_full: "{{ keystone_ssh_image }}:{{ keystone_ssh_tag }}"
+keystone_dimensions: "{{ default_container_dimensions }}"
+keystone_fernet_dimensions: "{{ default_container_dimensions }}"
+keystone_ssh_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack
diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml
index 6a6efb61e2bbbaadaf5caab2678e361f14118828..3173a86308fa88d62c17f1b110524f6525c7a602 100644
--- a/ansible/roles/keystone/handlers/main.yml
+++ b/ansible/roles/keystone/handlers/main.yml
@@ -20,6 +20,7 @@
name: "init_upgrade_database"
restart_policy: "never"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
run_once: True
when:
- kolla_action == "upgrade"
@@ -41,6 +42,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -66,6 +68,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -89,6 +92,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -117,6 +121,7 @@
name: "finish_upgrade_database"
restart_policy: "never"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
run_once: True
when:
- kolla_action == "upgrade"
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index 5c2dbe7890caed08b59de01e1aecee25eab1f2dd..bb7955c42ac51e8fa1c630c27c8e8c89b5ed2ff5 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -239,6 +239,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ item.value.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[item.value.group]
diff --git a/ansible/roles/kibana/defaults/main.yml b/ansible/roles/kibana/defaults/main.yml
index 71bf00d14262692f934ce2bf5547bb919ef130bc..b6c2bc8dea5fa48393083777c2f5836848c1d78e 100644
--- a/ansible/roles/kibana/defaults/main.yml
+++ b/ansible/roles/kibana/defaults/main.yml
@@ -11,6 +11,7 @@ kibana_services:
- "{{ node_config_directory }}/kibana/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ kibana_dimensions }}"
####################
@@ -38,3 +39,4 @@ kibana_default_index_options:
kibana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kibana"
kibana_tag: "{{ openstack_release }}"
kibana_image_full: "{{ kibana_image }}:{{ kibana_tag }}"
+kibana_dimensions: "{{ default_container_dimensions }}"
diff --git a/ansible/roles/kibana/handlers/main.yml b/ansible/roles/kibana/handlers/main.yml
index 75aac15ff268c8af064bfcd6875f69b19bd0349c..ea21e0a0566730278f256e83b207a3cd45459f17 100644
--- a/ansible/roles/kibana/handlers/main.yml
+++ b/ansible/roles/kibana/handlers/main.yml
@@ -13,6 +13,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/kibana/tasks/config.yml b/ansible/roles/kibana/tasks/config.yml
index 61037eec7e17cbef971358d2dd7ad5e316550bcd..ae23521e1076d7764da5786e84af6c6e0827ba29 100644
--- a/ansible/roles/kibana/tasks/config.yml
+++ b/ansible/roles/kibana/tasks/config.yml
@@ -48,6 +48,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_kibana_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/kuryr/defaults/main.yml b/ansible/roles/kuryr/defaults/main.yml
index 6cb7529ed9f6258ccd43287cfb70375fd76f115d..7b1d783a661f94eab2286fac6a924d033592fa34 100644
--- a/ansible/roles/kuryr/defaults/main.yml
+++ b/ansible/roles/kuryr/defaults/main.yml
@@ -26,6 +26,7 @@ kuryr_services:
- "{{ kolla_dev_repos_directory ~ '/kuryr/kuryr:/var/lib/kolla/venv/lib/python2.7/site-packages/kuryr' if kuryr_dev_mode | bool else '' }}"
- "{{ kolla_dev_repos_directory ~ '/kuryr-libnetwork/kuryr_libnetwork:/var/lib/kolla/venv/lib/python2.7/site-packages/kuryr_libnetwork' if kuryr_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ kuryr_dimensions }}"
####################
@@ -53,3 +54,4 @@ kuryr_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
kuryr_libnetwork_git_repository: "{{ kolla_dev_repos_git }}/{{ libnetwork_project_name }}"
kuryr_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
kuryr_dev_mode: "{{ kolla_dev_mode }}"
+kuryr_dimensions: "{{ default_container_dimensions }}"
diff --git a/ansible/roles/kuryr/handlers/main.yml b/ansible/roles/kuryr/handlers/main.yml
index 5ccc81f9ccee1219347fec209583078930ae8536..f9dc1c8751042f87e0041a45942f84fafefd2db7 100644
--- a/ansible/roles/kuryr/handlers/main.yml
+++ b/ansible/roles/kuryr/handlers/main.yml
@@ -16,6 +16,7 @@
privileged: "{{ service.privileged | default(False) }}"
cap_add: "{{ service.cap_add }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml
index 91a5c391705a16149795e5d1590f1a47dd136a56..adffced3015461abd776a3d45ee62aa3b4188b86 100644
--- a/ansible/roles/kuryr/tasks/config.yml
+++ b/ansible/roles/kuryr/tasks/config.yml
@@ -106,6 +106,7 @@
privileged: "{{ item.value.privileged|default(False) }}"
cap_add: "{{ item.value.cap_add }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_kuryr_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml
index faef6b827c7cd22004f0dd6c607310a51d05ec88..391ecbe025facf960beffd818fb8d0c96b903952 100644
--- a/ansible/roles/magnum/defaults/main.yml
+++ b/ansible/roles/magnum/defaults/main.yml
@@ -14,6 +14,7 @@ magnum_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/magnum/magnum:/var/lib/kolla/venv/lib/python2.7/site-packages/magnum' if magnum_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ magnum_api }}"
magnum-conductor:
container_name: magnum_conductor
group: magnum-conductor
@@ -26,6 +27,7 @@ magnum_services:
- "magnum:/var/lib/magnum/"
- "{{ kolla_dev_repos_directory ~ '/magnum/magnum:/var/lib/kolla/venv/lib/python2.7/site-packages/magnum' if magnum_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ magnum_conductor_dimensions }}"
####################
@@ -56,6 +58,9 @@ magnum_conductor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
magnum_conductor_tag: "{{ magnum_tag }}"
magnum_conductor_image_full: "{{ magnum_conductor_image }}:{{ magnum_conductor_tag }}"
+magnum_api_dimensions: "{{ default_container_dimensions }}"
+magnum_conductor_dimensions: "{{ default_container_dimensions }}"
+
####################
# OpenStack
diff --git a/ansible/roles/magnum/handlers/main.yml b/ansible/roles/magnum/handlers/main.yml
index 9c9a9d269c0ab564bc17a49afc41ecfaa04af1e0..82205c44a8a425ad9821aca9bd1d95923acc392a 100644
--- a/ansible/roles/magnum/handlers/main.yml
+++ b/ansible/roles/magnum/handlers/main.yml
@@ -15,6 +15,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
environment: "{{ service.environment }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -40,6 +41,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
environment: "{{ service.environment }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml
index 1701855eca1709a0cbc15169baeed070976f0e48..a8d1aadec7f8019a59a7f7a58b56c28d1a0248f5 100644
--- a/ansible/roles/magnum/tasks/config.yml
+++ b/ansible/roles/magnum/tasks/config.yml
@@ -90,6 +90,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ item.value.dimensions }}"
environment: "{{ item.value.environment }}"
register: check_magnum_containers
when:
diff --git a/ansible/roles/manila/defaults/main.yml b/ansible/roles/manila/defaults/main.yml
index 9fd82472dc4076f2bd274a9a0f436e23fdc0d9ad..decefdda49401bb679e8dd1d3151276004731dbd 100644
--- a/ansible/roles/manila/defaults/main.yml
+++ b/ansible/roles/manila/defaults/main.yml
@@ -12,6 +12,7 @@ manila_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/manila/manila:/var/lib/kolla/venv/lib/python2.7/site-packages/manila' if manila_dev_mode | bool else '' }}"
+ dimensions: "{{ manila_api_dimensions }}"
manila-scheduler:
container_name: "manila_scheduler"
group: "manila-scheduler"
@@ -22,6 +23,7 @@ manila_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/manila/manila:/var/lib/kolla/venv/lib/python2.7/site-packages/manila' if manila_dev_mode | bool else '' }}"
+ dimensions: "{{ manila_scheduler_dimensions }}"
manila-share:
container_name: "manila_share"
group: "manila-share"
@@ -34,6 +36,7 @@ manila_services:
- "/run/:/run/:shared"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/manila/manila:/var/lib/kolla/venv/lib/python2.7/site-packages/manila' if manila_dev_mode | bool else '' }}"
+ dimensions: "{{ manila_share_dimensions }}"
manila-data:
container_name: "manila_data"
group: "manila-data"
@@ -46,6 +49,7 @@ manila_services:
- "/run/:/run/:shared"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/manila/manila:/var/lib/kolla/venv/lib/python2.7/site-packages/manila' if manila_dev_mode | bool else '' }}"
+ dimensions: "{{ manila_data_dimensions }}"
#####################
@@ -93,6 +97,11 @@ manila_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ doc
manila_data_tag: "{{ manila_tag }}"
manila_data_image_full: "{{ manila_data_image }}:{{ manila_data_tag }}"
+manila_share_dimensions: "{{ default_container_dimensions }}"
+manila_scheduler_dimensions: "{{ default_container_dimensions }}"
+manila_api_dimensions: "{{ default_container_dimensions }}"
+manila_data_dimensions: "{{ default_container_dimensions }}"
+
#####################
## OpenStack
diff --git a/ansible/roles/manila/handlers/main.yml b/ansible/roles/manila/handlers/main.yml
index 426ee9a0245c5884d9f4af807cd5fa3fcf4c3f11..c2d9bc74cbcfaf032fe6fa6c9e95f8183518b4a4 100644
--- a/ansible/roles/manila/handlers/main.yml
+++ b/ansible/roles/manila/handlers/main.yml
@@ -14,6 +14,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -39,6 +40,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -63,6 +65,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -87,6 +90,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml
index 89cb46f0a4ad53e0a6294ce6d77ccbec0df1320d..aa54addb6e62c2233b6530d7f22d59f9c0a8a28f 100644
--- a/ansible/roles/manila/tasks/config.yml
+++ b/ansible/roles/manila/tasks/config.yml
@@ -114,6 +114,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged|default(False) }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_manila_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index f0b885609f348a594d096cbc537be078d3127f9d..3d3870d256ef09e48ccd8db5277ffb578d698844 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -12,6 +12,7 @@ mariadb_services:
- "/etc/localtime:/etc/localtime:ro"
- "mariadb:/var/lib/mysql"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ mariadb_dimensions }}"
####################
@@ -26,6 +27,7 @@ database_max_timeout: 120
mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-mariadb"
mariadb_tag: "{{ openstack_release }}"
mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}"
+mariadb_dimensions: "{{ default_container_dimensions }}"
########################################
# Vars used within recover_cluster.yml
diff --git a/ansible/roles/mariadb/handlers/main.yml b/ansible/roles/mariadb/handlers/main.yml
index 213711d09ee653ae03c7e50d701e7b11fb13eede..abdbe926faa6ae51ddf385d6803648d9107a680d 100644
--- a/ansible/roles/mariadb/handlers/main.yml
+++ b/ansible/roles/mariadb/handlers/main.yml
@@ -16,6 +16,7 @@
name: "{{ service.container_name }}"
restart_policy: "never"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- bootstrap_host is defined
- bootstrap_host == inventory_hostname
@@ -54,6 +55,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname != master_host
@@ -96,6 +98,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname == master_host
diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml
index 68072be1f50905f267962bd377316e668cd79fa0..99510b4145e5a74a38a6c5e1edb3b2040d3d8ad3 100644
--- a/ansible/roles/mariadb/tasks/config.yml
+++ b/ansible/roles/mariadb/tasks/config.yml
@@ -72,6 +72,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_mariadb_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/memcached/defaults/main.yml b/ansible/roles/memcached/defaults/main.yml
index d21a55b61583e5e056d22e95228b0f0a558f93cc..604ac565b698747456d51f68bbd844833a951064 100644
--- a/ansible/roles/memcached/defaults/main.yml
+++ b/ansible/roles/memcached/defaults/main.yml
@@ -10,6 +10,7 @@ memcached_services:
volumes:
- "{{ node_config_directory }}/memcached/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
+ dimensions: "{{ memcached_dimensions }}"
####################
@@ -18,6 +19,7 @@ memcached_services:
memcached_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-memcached"
memcached_tag: "{{ openstack_release }}"
memcached_image_full: "{{ memcached_image }}:{{ memcached_tag }}"
+memcached_dimensions: "{{ default_container_dimensions }}"
####################
# Memcached options
diff --git a/ansible/roles/memcached/handlers/main.yml b/ansible/roles/memcached/handlers/main.yml
index 11a82ef58283df859a6f31a8d64d4a751e76e2d2..b732f305d50b6ebf5b7790d1f5c9244257ffa983 100644
--- a/ansible/roles/memcached/handlers/main.yml
+++ b/ansible/roles/memcached/handlers/main.yml
@@ -9,6 +9,7 @@
image: "{{ service.image }}"
name: "{{ service.container_name }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/memcached/tasks/config.yml b/ansible/roles/memcached/tasks/config.yml
index 77011b45889ee4361e8d1e9403cd76b3853d5a8f..27e56118d2bbce7b0e87cc96d2d5ebfe2ad733b4 100644
--- a/ansible/roles/memcached/tasks/config.yml
+++ b/ansible/roles/memcached/tasks/config.yml
@@ -31,6 +31,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
register: check_memcached_container
when:
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml
index 1c651445d23dd5c50dfbcda30dc0a4dde311b598..a6379704747f29f7dc07c7de987deab2749bb96c 100644
--- a/ansible/roles/mistral/defaults/main.yml
+++ b/ansible/roles/mistral/defaults/main.yml
@@ -12,6 +12,7 @@ mistral_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/mistral/mistral:/var/lib/kolla/venv/lib/python2.7/site-packages/mistral' if mistral_dev_mode | bool else '' }}"
+ dimensions: "{{ mistral_api_dimensions }}"
mistral-engine:
container_name: mistral_engine
group: mistral-engine
@@ -22,6 +23,7 @@ mistral_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/mistral/mistral:/var/lib/kolla/venv/lib/python2.7/site-packages/mistral' if mistral_dev_mode | bool else '' }}"
+ dimensions: "{{ mistral_engine_dimensions }}"
mistral-executor:
container_name: mistral_executor
group: mistral-executor
@@ -32,6 +34,7 @@ mistral_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/mistral/mistral:/var/lib/kolla/venv/lib/python2.7/site-packages/mistral' if mistral_dev_mode | bool else '' }}"
+ dimensions: "{{ mistral_executor_dimensions }}"
####################
@@ -60,6 +63,10 @@ mistral_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ doc
mistral_api_tag: "{{ mistral_tag }}"
mistral_api_image_full: "{{ mistral_api_image }}:{{ mistral_api_tag }}"
+mistral_engine_dimensions: "{{ default_container_dimensions }}"
+mistral_executor_dimensions: "{{ default_container_dimensions }}"
+mistral_api_dimensions: "{{ default_container_dimensions }}"
+
####################
# OpenStack
diff --git a/ansible/roles/mistral/handlers/main.yml b/ansible/roles/mistral/handlers/main.yml
index 641abf0fc72386e559f579f660d7d544eac699f4..ee5b02b25957ba5e3070620dd89b398f2290e41b 100644
--- a/ansible/roles/mistral/handlers/main.yml
+++ b/ansible/roles/mistral/handlers/main.yml
@@ -14,6 +14,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -38,6 +39,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -62,6 +64,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml
index c16dc4b724b950773c9861023f43dcd8829a7226..889cadb1738b232d23da77eb575d0206e0b80e80 100644
--- a/ansible/roles/mistral/tasks/config.yml
+++ b/ansible/roles/mistral/tasks/config.yml
@@ -87,6 +87,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_mistral_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/monasca/defaults/main.yml b/ansible/roles/monasca/defaults/main.yml
index c8dc213438294f85bf179c252e17945270b64bc8..0c8b717f0e388541b676b2cdb36e0c5ebb96097c 100644
--- a/ansible/roles/monasca/defaults/main.yml
+++ b/ansible/roles/monasca/defaults/main.yml
@@ -9,6 +9,7 @@ monasca_services:
- "{{ node_config_directory }}/monasca-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ monasca_api_dimensions }}"
monasca-log-api:
container_name: monasca_log_api
group: monasca-log-api
@@ -18,6 +19,7 @@ monasca_services:
- "{{ node_config_directory }}/monasca-log-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ monasca_log_api_dimensions }}"
monasca-log-transformer:
container_name: monasca_log_transformer
group: monasca-log-transformer
@@ -27,6 +29,7 @@ monasca_services:
- "{{ node_config_directory }}/monasca-log-transformer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ monasca_log_transformer_dimensions }}"
monasca-log-persister:
container_name: monasca_log_persister
group: monasca-log-persister
@@ -36,6 +39,7 @@ monasca_services:
- "{{ node_config_directory }}/monasca-log-persister/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla"
+ dimensions: "{{ monasca_log_persister_dimensions }}"
####################
# Databases
@@ -78,6 +82,12 @@ monasca_logstash_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
monasca_logstash_tag: "{{ monasca_tag }}"
monasca_logstash_image_full: "{{ monasca_logstash_image }}:{{ monasca_logstash_tag }}"
+monasca_api_dimensions: "{{ default_container_dimensions }}"
+monasca_log_api_dimensions: "{{ default_container_dimensions }}"
+monasca_log_transformer_dimensions: "{{ default_container_dimensions }}"
+monasca_log_persister_dimensions: "{{ default_container_dimensions }}"
+
+
####################
# OpenStack
####################
diff --git a/ansible/roles/monasca/handlers/main.yml b/ansible/roles/monasca/handlers/main.yml
index dc1aa80ac6354e89b41b21dd770bd9713651ccb8..d20d442741af210741ce8a728745460f73e4e3c2 100644
--- a/ansible/roles/monasca/handlers/main.yml
+++ b/ansible/roles/monasca/handlers/main.yml
@@ -12,6 +12,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -34,6 +35,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -55,6 +57,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -75,6 +78,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/monasca/tasks/config.yml b/ansible/roles/monasca/tasks/config.yml
index 66217b512423baaeee44e996f9e0997624939ea6..aa81463bfbe17fb461080603d49bb050867598d2 100644
--- a/ansible/roles/monasca/tasks/config.yml
+++ b/ansible/roles/monasca/tasks/config.yml
@@ -165,6 +165,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_monasca_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/mongodb/defaults/main.yml b/ansible/roles/mongodb/defaults/main.yml
index 59645ecaef016155894f917d6a43d107397ee041..9885eedbe8626b096b051445378b341e75887f05 100644
--- a/ansible/roles/mongodb/defaults/main.yml
+++ b/ansible/roles/mongodb/defaults/main.yml
@@ -13,6 +13,7 @@ mongodb_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "mongodb:/var/lib/mongodb"
+ dimensions: "{{ mongodb_dimensions }}"
####################
@@ -21,7 +22,7 @@ mongodb_services:
mongodb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-mongodb"
mongodb_tag: "{{ openstack_release }}"
mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
-
+mongodb_dimensions: "{{ default_container_dimensions }}"
####################
# Mongodb
diff --git a/ansible/roles/mongodb/handlers/main.yml b/ansible/roles/mongodb/handlers/main.yml
index a9e69d813f3763ee4b4146042748284ca6924b96..156922903e7424b462488298fd1a483c7242a2d4 100644
--- a/ansible/roles/mongodb/handlers/main.yml
+++ b/ansible/roles/mongodb/handlers/main.yml
@@ -14,6 +14,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/mongodb/tasks/config.yml b/ansible/roles/mongodb/tasks/config.yml
index 9a8b8a71c87c832cff19b923800cbbc1f6c6fde9..dbd71c4a6844cb243ff73799af083522765a48b1 100644
--- a/ansible/roles/mongodb/tasks/config.yml
+++ b/ansible/roles/mongodb/tasks/config.yml
@@ -49,6 +49,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged|default(False) }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_mongodb_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/murano/defaults/main.yml b/ansible/roles/murano/defaults/main.yml
index ed1f2d14bf0cb956fc83bd486281ccdf7788eebf..c16a2ae38cf2c44ebbfba5b6788f88ea0dcc422b 100644
--- a/ansible/roles/murano/defaults/main.yml
+++ b/ansible/roles/murano/defaults/main.yml
@@ -12,6 +12,7 @@ murano_services:
- "{{ kolla_dev_repos_directory ~ '/murano/murano:/var/lib/kolla/venv/lib/python2.7/site-packages/murano' if murano_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ murano_api_dimensions }}"
murano-engine:
container_name: murano_engine
group: murano-engine
@@ -22,6 +23,7 @@ murano_services:
- "{{ kolla_dev_repos_directory ~ '/murano/murano:/var/lib/kolla/venv/lib/python2.7/site-packages/murano' if murano_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ murano_engine_dimensions }}"
####################
@@ -46,6 +48,9 @@ murano_engine_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ d
murano_engine_tag: "{{ murano_tag }}"
murano_engine_image_full: "{{ murano_engine_image }}:{{ murano_engine_tag }}"
+murano_api_dimensions: "{{ default_container_dimensions }}"
+murano_engine_dimensions: "{{ default_container_dimensions }}"
+
####################
# OpenStack
diff --git a/ansible/roles/murano/handlers/main.yml b/ansible/roles/murano/handlers/main.yml
index 5d241344601c4d80c2e48f64915cd55c5290c30d..3520ce6bba012088d73dece922e3fb9b8a1af4aa 100644
--- a/ansible/roles/murano/handlers/main.yml
+++ b/ansible/roles/murano/handlers/main.yml
@@ -14,6 +14,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@@ -39,6 +40,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml
index 3b52abb311270b38a802ed0f1abe9e542f8d70b7..ad6bf262318f3e790d98e5bfb98bd53e2c0a5479 100644
--- a/ansible/roles/murano/tasks/config.yml
+++ b/ansible/roles/murano/tasks/config.yml
@@ -86,6 +86,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_murano_containers
when:
- kolla_action != "config"
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 959efc41c97bd7cab4952bc54d9ddc348d0530c5..c86d752aeca7b8d3d62194a551d7827701113eb0 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -12,6 +12,7 @@ neutron_services:
- "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_server_dimensions }}"
neutron-openvswitch-agent:
container_name: "neutron_openvswitch_agent"
image: "{{ neutron_openvswitch_agent_image_full }}"
@@ -38,6 +39,7 @@ neutron_services:
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_openvswitch_agent_dimensions }}"
neutron-openvswitch-agent-xenapi:
container_name: "neutron_openvswitch_agent_xenapi"
image: "{{ neutron_openvswitch_agent_image_full }}"
@@ -53,6 +55,7 @@ neutron_services:
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_openvswitch_agent_xenapi_dimensions }}"
neutron-linuxbridge-agent:
container_name: "neutron_linuxbridge_agent"
image: "{{ neutron_linuxbridge_agent_image_full }}"
@@ -76,6 +79,7 @@ neutron_services:
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_linuxbridge_agent_dimensions }}"
neutron-dhcp-agent:
container_name: "neutron_dhcp_agent"
image: "{{ neutron_dhcp_agent_image_full }}"
@@ -89,6 +93,7 @@ neutron_services:
- "/run/:/run/:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_dhcp_agent_dimensions }}"
neutron-l3-agent:
container_name: "neutron_l3_agent"
image: "{{ neutron_l3_agent_image_full }}"
@@ -106,6 +111,7 @@ neutron_services:
- "/run:/run:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_l3_agent_dimensions }}"
neutron-lbaas-agent:
container_name: "neutron_lbaas_agent"
image: "{{ neutron_lbaas_agent_image_full }}"
@@ -118,6 +124,7 @@ neutron_services:
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_lbaas_agent_dimensions }}"
neutron-sriov-agent:
container_name: "neutron_sriov_agent"
image: "{{ neutron_sriov_agent_image_full }}"
@@ -129,6 +136,7 @@ neutron_services:
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_sriov_agent_dimensions }}"
neutron-metadata-agent:
container_name: "neutron_metadata_agent"
image: "{{ neutron_metadata_agent_image_full }}"
@@ -145,6 +153,7 @@ neutron_services:
- "/run/:/run/:shared"
- "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_metadata_agent_dimensions }}"
neutron-bgp-dragent:
container_name: "neutron_bgp_dragent"
image: "{{ neutron_bgp_dragent_image_full }}"
@@ -157,6 +166,7 @@ neutron_services:
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_bgp_dragent_dimensions }}"
neutron-infoblox-ipam-agent:
container_name: "neutron_infoblox_ipam_agent"
image: "{{ neutron_infoblox_ipam_agent_image_full }}"
@@ -169,6 +179,7 @@ neutron_services:
- "/etc/localtime:/etc/localtime:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
+ dimensions: "{{ neutron_infoblox_ipam_agent_dimensions }}"
ironic-neutron-agent:
container_name: "ironic_neutron_agent"
image: "{{ ironic_neutron_agent_image_full }}"
@@ -180,7 +191,7 @@ neutron_services:
- "{{ node_config_directory }}/ironic-neutron-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
-
+ dimensions: "{{ ironic_neutron_agent_dimensions }}"
####################
# Database
@@ -240,6 +251,20 @@ ironic_neutron_agent_image: "{{ docker_registry ~ '/' if docker_registry else ''
ironic_neutron_agent_tag: "{{ neutron_tag }}"
ironic_neutron_agent_image_full: "{{ ironic_neutron_agent_image }}:{{ ironic_neutron_agent_tag }}"
+neutron_dhcp_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_l3_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_lbaas_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_sriov_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_linuxbridge_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_metadata_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_openvswitch_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_server_dimensions: "{{ default_container_dimensions }}"
+neutron_bgp_dragent_dimensions: "{{ default_container_dimensions }}"
+neutron_infoblox_ipam_agent_dimensions: "{{ default_container_dimensions }}"
+neutron_openvswitch_agent_xenapi_dimensions: "{{ default_container_dimensions }}"
+ironic_neutron_agent_dimensions: "{{ default_container_dimensions }}"
+
+
####################
# OpenStack
####################
diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml
index 75f05bdf86c764d0fb3cac779d0c325bfa7a1c25..c4b6d2d81de30a6834529faf799c092b5852e93a 100644
--- a/ansible/roles/neutron/handlers/main.yml
+++ b/ansible/roles/neutron/handlers/main.yml
@@ -17,6 +17,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -47,6 +48,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -74,6 +76,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -101,6 +104,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
when:
@@ -130,6 +134,7 @@
image: "{{ service.image }}"
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -156,6 +161,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -187,6 +193,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -217,6 +224,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -244,6 +252,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -270,6 +279,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -296,6 +306,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -322,6 +333,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
@@ -346,6 +358,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
+ dimensions: "{{ service.dimensions }}"
privileged: "{{ service.privileged | default(False) }}"
when:
- kolla_action != "config"
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 6a44ff53ccf6d1e79f42896dde178ea0c9f19f62..8f06a93001b50f2531926b621f3f3a0add835a6e 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -441,6 +441,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}"
+ dimensions: "{{ item.value.dimensions }}"
register: check_neutron_containers
when:
- kolla_action != "config"