Merge "Apply Resource Constraints to Services."

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

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]

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"

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 }}"

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]

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"

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

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"

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"

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 }}"

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]

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"

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

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]

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"

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

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"

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]

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 }}"

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]