Merge "Apply Resource Constraints to Services."

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"

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

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]

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"

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

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]

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:

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

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]

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"

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

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

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"

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

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]

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]

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

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]

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"

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
 ####################