From 14bf524756f15f07120d68879fd7d64fb499bb6c Mon Sep 17 00:00:00 2001
From: Lakshmi Prasanna Goutham Pratapa <lakshmi.pratapa@imaginea.com>
Date: Tue, 17 Jul 2018 20:04:53 +0530
Subject: [PATCH] Apply Resource Constraints to Services.

This commit is to apply resource-constraints to a few more OpenStack services.
Commit to  apply constraints to the last set of services will be made in
the upcoming commit.

Depends-on: Icafa54baca24d2de64238222a5677b9d8b90e2aa
Change-Id: I39004f54281f97d53dfa4b1dbcf248650ad6f186
---
 ansible/roles/horizon/defaults/main.yml   |  2 ++
 ansible/roles/horizon/handlers/main.yml   |  1 +
 ansible/roles/horizon/tasks/config.yml    |  1 +
 ansible/roles/influxdb/defaults/main.yml  |  2 ++
 ansible/roles/influxdb/handlers/main.yml  |  1 +
 ansible/roles/influxdb/tasks/config.yml   |  1 +
 ansible/roles/ironic/defaults/main.yml    | 12 ++++++++++
 ansible/roles/ironic/handlers/main.yml    |  6 +++++
 ansible/roles/ironic/tasks/config.yml     |  1 +
 ansible/roles/kafka/defaults/main.yml     |  2 ++
 ansible/roles/kafka/handlers/main.yml     |  1 +
 ansible/roles/kafka/tasks/config.yml      |  1 +
 ansible/roles/karbor/defaults/main.yml    |  7 ++++++
 ansible/roles/karbor/handlers/main.yml    |  3 +++
 ansible/roles/karbor/tasks/config.yml     |  1 +
 ansible/roles/keystone/defaults/main.yml  |  6 +++++
 ansible/roles/keystone/handlers/main.yml  |  5 +++++
 ansible/roles/keystone/tasks/config.yml   |  1 +
 ansible/roles/kibana/defaults/main.yml    |  2 ++
 ansible/roles/kibana/handlers/main.yml    |  1 +
 ansible/roles/kibana/tasks/config.yml     |  1 +
 ansible/roles/kuryr/defaults/main.yml     |  2 ++
 ansible/roles/kuryr/handlers/main.yml     |  1 +
 ansible/roles/kuryr/tasks/config.yml      |  1 +
 ansible/roles/magnum/defaults/main.yml    |  5 +++++
 ansible/roles/magnum/handlers/main.yml    |  2 ++
 ansible/roles/magnum/tasks/config.yml     |  1 +
 ansible/roles/manila/defaults/main.yml    |  9 ++++++++
 ansible/roles/manila/handlers/main.yml    |  4 ++++
 ansible/roles/manila/tasks/config.yml     |  1 +
 ansible/roles/mariadb/defaults/main.yml   |  2 ++
 ansible/roles/mariadb/handlers/main.yml   |  3 +++
 ansible/roles/mariadb/tasks/config.yml    |  1 +
 ansible/roles/memcached/defaults/main.yml |  2 ++
 ansible/roles/memcached/handlers/main.yml |  1 +
 ansible/roles/memcached/tasks/config.yml  |  1 +
 ansible/roles/mistral/defaults/main.yml   |  7 ++++++
 ansible/roles/mistral/handlers/main.yml   |  3 +++
 ansible/roles/mistral/tasks/config.yml    |  1 +
 ansible/roles/monasca/defaults/main.yml   | 10 +++++++++
 ansible/roles/monasca/handlers/main.yml   |  4 ++++
 ansible/roles/monasca/tasks/config.yml    |  1 +
 ansible/roles/mongodb/defaults/main.yml   |  3 ++-
 ansible/roles/mongodb/handlers/main.yml   |  1 +
 ansible/roles/mongodb/tasks/config.yml    |  1 +
 ansible/roles/murano/defaults/main.yml    |  5 +++++
 ansible/roles/murano/handlers/main.yml    |  2 ++
 ansible/roles/murano/tasks/config.yml     |  1 +
 ansible/roles/neutron/defaults/main.yml   | 27 ++++++++++++++++++++++-
 ansible/roles/neutron/handlers/main.yml   | 13 +++++++++++
 ansible/roles/neutron/tasks/config.yml    |  1 +
 51 files changed, 172 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index 74805691ef..9fac5bc0e1 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 c82a3c3551..e18fc04921 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 fc959e92a0..a50ee44b75 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 81e4efffaa..76f06a8074 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 8f900b00da..2e9bd3bc13 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 13c35d47bd..91e4ace933 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 c21b23897f..37034d07dc 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 15ded2fafb..5fc02543c1 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 c1efd18c5a..0d3627f357 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 ecf13665cb..2eaf6d8a89 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 fe274b9ae8..ba71ff36f2 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 de6a8dc5d0..506f7d6a02 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 2be3cc6b4f..aed8e0ef0b 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 4be0cb95c0..40a1f4e74a 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 792a4f86ac..609323b2f0 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 4f55a40b56..4f1af8adc1 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 6a6efb61e2..3173a86308 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 5c2dbe7890..bb7955c42a 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 71bf00d142..b6c2bc8dea 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 75aac15ff2..ea21e0a056 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 61037eec7e..ae23521e10 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 6cb7529ed9..7b1d783a66 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 5ccc81f9cc..f9dc1c8751 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 91a5c39170..adffced301 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 faef6b827c..391ecbe025 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 9c9a9d269c..82205c44a8 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 1701855eca..a8d1aadec7 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 9fd82472dc..decefdda49 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 426ee9a024..c2d9bc74cb 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 89cb46f0a4..aa54addb6e 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 f0b885609f..3d3870d256 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 213711d09e..abdbe926fa 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 68072be1f5..99510b4145 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 d21a55b615..604ac565b6 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 11a82ef582..b732f305d5 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 77011b4588..27e56118d2 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 1c651445d2..a637970474 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 641abf0fc7..ee5b02b259 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 c16dc4b724..889cadb173 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 c8dc213438..0c8b717f0e 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 dc1aa80ac6..d20d442741 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 66217b5124..aa81463bfb 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 59645ecaef..9885eedbe8 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 a9e69d813f..156922903e 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 9a8b8a71c8..dbd71c4a68 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 ed1f2d14bf..c16a2ae38c 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 5d24134460..3520ce6bba 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 3b52abb311..ad6bf26231 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 959efc41c9..c86d752aec 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 67e390d02c..96c108f5d3 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:
     - action != "config"
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index 6a44ff53cc..8f06a93001 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"