openstack/kolla-ansible
Code Issues Proposed changes

Apply Resource-Constraints to all services.

Browse Source 
This commit is the final commit to apply resource-constraints
to all OpenStack services.

Depends-on: I39004f54281f97d53dfa4b1dbcf248650ad6f186
Change-Id: I072d69be9698be54775cb0ae286ea2b6ed78776c
Implements: blueprint resource-constraints
This commit is contained in:
Lakshmi Prasanna Goutham Pratapa 2018-07-18 15:42:15 +05:30
parent d14f420ad0
commit 9f0db30fd1
72 changed files with 196 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/roles/octavia/defaults/main.yml
View File

@ -11,6 +11,7 @@ octavia_services:
- "{{ node_config_directory }}/octavia-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ octavia_api_dimensions }}"
octavia-health-manager:
container_name: octavia_health_manager
group: octavia-health-manager
@ -20,6 +21,7 @@ octavia_services:
- "{{ node_config_directory }}/octavia-health-manager/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ octavia_health_manager_dimensions }}"
octavia-housekeeping:
container_name: octavia_housekeeping
group: octavia-housekeeping
@ -29,6 +31,7 @@ octavia_services:
- "{{ node_config_directory }}/octavia-housekeeping/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ octavia_housekeeping_dimensions }}"
octavia-worker:
container_name: octavia_worker
group: octavia-worker
@ -38,6 +41,7 @@ octavia_services:
- "{{ node_config_directory }}/octavia-worker/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ octavia_worker_dimensions }}"
octavia_required_roles:
- load-balancer_observer
@ -77,6 +81,11 @@ octavia_worker_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{
octavia_worker_tag: "{{ octavia_tag }}"
octavia_worker_image_full: "{{ octavia_worker_image }}:{{ octavia_worker_tag }}"
octavia_api_dimensions: "{{ default_container_dimensions }}"
octavia_health_manager_dimensions: "{{ default_container_dimensions }}"
octavia_housekeeping_dimensions: "{{ default_container_dimensions }}"
octavia_worker_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

4
ansible/roles/octavia/handlers/main.yml
View File

@ -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]
@ -81,6 +84,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/octavia/tasks/config.yml
View File

@ -108,6 +108,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_octavia_containers
when:
- kolla_action != "config"

2
ansible/roles/opendaylight/defaults/main.yml
View File

@ -13,6 +13,7 @@ opendaylight_services:
- "{{ node_config_directory }}/opendaylight/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ opendaylight_dimensions }}"
####################
# Docker
@ -22,3 +23,4 @@ opendaylight_install_type: "{{ kolla_install_type }}"
opendaylight_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ opendaylight_install_type }}-opendaylight"
opendaylight_tag: "{{ openstack_release }}"
opendaylight_image_full: "{{ opendaylight_image }}:{{ opendaylight_tag }}"
opendaylight_dimensions: "{{ default_container_dimensions }}"

1
ansible/roles/opendaylight/handlers/main.yml
View File

@ -11,6 +11,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- service.enabled | bool

1
ansible/roles/opendaylight/tasks/config.yml
View File

@ -213,6 +213,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_opendaylight_containers
when:
- kolla_action != "config"

5
ansible/roles/openvswitch/defaults/main.yml
View File

@ -22,6 +22,7 @@ openvswitch_services:
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
- "openvswitch_db:/var/lib/openvswitch/"
dimensions: "{{ openvswitch_db_dimensions }}"
openvswitch-vswitchd:
container_name: "openvswitch_vswitchd"
image: "{{ openvswitch_vswitchd_image_full }}"
@ -42,6 +43,7 @@ openvswitch_services:
- "/lib/modules:/lib/modules:ro"
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ openvswitch_vswitchd_dimensions }}"
####################
# Docker
@ -56,3 +58,6 @@ openvswitch_db_image_full: "{{ openvswitch_db_image }}:{{ openvswitch_db_tag }}"
openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ openvswitch_install_type }}-openvswitch-vswitchd"
openvswitch_vswitchd_tag: "{{ openvswitch_tag }}"
openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitch_vswitchd_tag }}"
openvswitch_db_dimensions: "{{ default_container_dimensions }}"
openvswitch_vswitchd_dimensions: "{{ default_container_dimensions }}"

2
ansible/roles/openvswitch/handlers/main.yml
View File

@ -12,6 +12,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- service.enabled | bool
@ -57,6 +58,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- service.enabled | bool

1
ansible/roles/openvswitch/tasks/config.yml
View File

@ -63,6 +63,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_openvswitch_containers
when:
- kolla_action != "config"

4
ansible/roles/ovs-dpdk/defaults/main.yml
View File

@ -22,6 +22,7 @@ ovsdpdk_services:
- "/run:/run:shared"
- "kolla_logs:/var/log/kolla/"
- "ovsdpdk_db:/var/lib/openvswitch/"
dimensions: "{{ ovsdpdk_db_dimensions }}"
ovsdpdk-vswitchd:
container_name: "ovsdpdk_vswitchd"
image: "{{ ovsdpdk_vswitchd_image_full }}"
@ -42,6 +43,7 @@ ovsdpdk_services:
- "/run:/run:shared"
- "/dev:/dev:shared"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ ovsdpdk_vswitchd_dimensions }}"
####################
# OVS
@ -81,3 +83,5 @@ ovsdpdk_db_image_full: "{{ ovsdpdk_db_image }}:{{ ovsdpdk_db_tag }}"
ovsdpdk_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ ovsdpdk_install_type }}-ovsdpdk-vswitchd"
ovsdpdk_vswitchd_tag: "{{ ovsdpdk_tag }}"
ovsdpdk_vswitchd_image_full: "{{ ovsdpdk_vswitchd_image }}:{{ ovsdpdk_vswitchd_tag }}"
ovsdpdk_db_dimensions: "{{ default_container_dimensions }}"
ovsdpdk_vswitchd_dimensions: "{{ default_container_dimensions }}"

2
ansible/roles/ovs-dpdk/handlers/main.yml
View File

@ -12,6 +12,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- service.enabled | bool
@ -66,6 +67,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(True) }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- service.enabled | bool

1
ansible/roles/ovs-dpdk/tasks/config.yml
View File

@ -53,6 +53,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_ovsdpdk_containers
when:
- kolla_action != "config"

2
ansible/roles/panko/defaults/main.yml
View File

@ -11,6 +11,7 @@ panko_services:
- "{{ node_config_directory }}/panko-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ panko_api_dimensions }}"
####################
@ -28,6 +29,7 @@ panko_database_mysql_address: "{{ database_address }}:{{ database_port }}"
panko_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-panko-api"
panko_api_tag: "{{ openstack_release }}"
panko_api_image_full: "{{ panko_api_image }}:{{ panko_api_tag }}"
panko_api_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

1
ansible/roles/panko/handlers/main.yml
View File

@ -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]

1
ansible/roles/panko/tasks/config.yml
View File

@ -102,6 +102,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_panko_containers
when:
- kolla_action != "config"

15
ansible/roles/prometheus/defaults/main.yml
View File

@ -12,6 +12,7 @@ prometheus_services:
- "/etc/localtime:/etc/localtime:ro"
- "prometheus:/var/lib/prometheus"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ prometheus_server_dimensions }}"
prometheus-node-exporter:
container_name: prometheus_node_exporter
group: prometheus-node-exporter
@ -24,6 +25,7 @@ prometheus_services:
- "kolla_logs:/var/log/kolla/"
- "/proc:/host/proc:ro"
- "/sys:/host/sys:ro"
dimensions: "{{ prometheus_node_exporter_dimensions }}"
prometheus-mysqld-exporter:
container_name: prometheus_mysqld_exporter
group: prometheus-mysqld-exporter
@ -33,6 +35,7 @@ prometheus_services:
- "{{ node_config_directory }}/prometheus-mysqld-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ prometheus_mysqld_exporter_dimensions }}"
prometheus-haproxy-exporter:
container_name: prometheus_haproxy_exporter
group: prometheus-haproxy-exporter
@ -43,6 +46,7 @@ prometheus_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "haproxy_socket:/var/lib/kolla/haproxy"
dimensions: "{{ prometheus_haproxy_exporter_dimensions }}"
prometheus-memcached-exporter:
container_name: prometheus_memcached_exporter
group: prometheus-memcached-exporter
@ -52,6 +56,7 @@ prometheus_services:
- "{{ node_config_directory }}/prometheus-memcached-exporter/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ prometheus_memcached_exporter_dimensions }}"
prometheus-cadvisor:
container_name: "prometheus_cadvisor"
group: "prometheus-cadvisor"
@ -66,6 +71,7 @@ prometheus_services:
- "/sys:/sys:ro"
- "/varlib/docker/:/var/lib/docker:ro"
- "/dev/disk/:/dev/disk:ro"
dimensions: "{{ prometheus_cadvisor_dimensions }}"
prometheus-alertmanager:
container_name: "prometheus_alertmanager"
group: "prometheus-alertmanager"
@ -76,6 +82,7 @@ prometheus_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "prometheus:/var/lib/prometheus"
dimensions: "{{ prometheus_alertmanager_dimensions }}"
####################
# Database
@ -115,3 +122,11 @@ prometheus_cadvisor_image_full: "{{ prometheus_cadvisor_image }}:{{ prometheus_c
prometheus_alertmanager_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-prometheus-alertmanager"
prometheus_alertmanager_tag: "{{ openstack_release }}"
prometheus_alertmanager_image_full: "{{ prometheus_alertmanager_image }}:{{ prometheus_alertmanager_tag }}"
prometheus_server_dimensions: "{{ default_container_dimensions }}"
prometheus_haproxy_exporter_dimensions: "{{ default_container_dimensions }}"
prometheus_mysqld_exporter_dimensions: "{{ default_container_dimensions }}"
prometheus_node_exporter_dimensions: "{{ default_container_dimensions }}"
prometheus_memcached_exporter_dimensions: "{{ default_container_dimensions }}"
prometheus_cadvisor_dimensions: "{{ default_container_dimensions }}"
prometheus_alertmanager_dimensions: "{{ default_container_dimensions }}"

7
ansible/roles/prometheus/handlers/main.yml
View File

@ -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 @@
image: "{{ service.image }}"
pid_mode: "{{ service.pid_mode | default(emit) }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@ -54,6 +56,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]
@ -95,6 +99,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@ -114,6 +119,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
@ -133,6 +139,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/prometheus/tasks/config.yml
View File

@ -81,6 +81,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_prometheus_containers
when:
- kolla_action != "config"

3
ansible/roles/qdrouterd/defaults/main.yml
View File

@ -12,7 +12,7 @@ qdrouterd_services:
- "/etc/localtime:/etc/localtime:ro"
- "qdrouterd:/var/lib/qdrouterd/"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ qdrouterd_dimensions }}"
####################
# Docker
@ -20,3 +20,4 @@ qdrouterd_services:
qdrouterd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-qdrouterd"
qdrouterd_tag: "{{ openstack_release }}"
qdrouterd_image_full: "{{ qdrouterd_image }}:{{ qdrouterd_tag }}"
qdrouterd_dimensions: "{{ default_container_dimensions }}"

1
ansible/roles/qdrouterd/handlers/main.yml
View File

@ -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]

1
ansible/roles/qdrouterd/tasks/config.yml
View File

@ -72,6 +72,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_qdrouterd_containers
when:
- kolla_action != "config"

2
ansible/roles/rabbitmq/defaults/main.yml
View File

@ -21,6 +21,7 @@ rabbitmq_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ project_name }}:/var/lib/rabbitmq/"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ rabbitmq_dimensions }}"
####################
@ -29,6 +30,7 @@ rabbitmq_services:
rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-rabbitmq"
rabbitmq_tag: "{{ openstack_release }}"
rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
rabbitmq_dimensions: "{{ default_container_dimensions }}"
####################

1
ansible/roles/rabbitmq/handlers/main.yml
View File

@ -13,6 +13,7 @@
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
environment: "{{ service.environment }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/rabbitmq/tasks/config.yml
View File

@ -55,6 +55,7 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
environment: "{{ item.value.environment }}"
dimensions: "{{ item.value.dimensions }}"
register: check_rabbitmq_containers
when:
- kolla_action != "config"

2
ansible/roles/rally/defaults/main.yml
View File

@ -11,6 +11,7 @@ rally_services:
- "{{ node_config_directory }}/rally/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ rally_dimensions }}"
########
@ -19,6 +20,7 @@ rally_services:
rally_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-rally"
rally_tag: "{{ openstack_release }}"
rally_image_full: "{{ rally_image }}:{{ rally_tag }}"
rally_dimensions: "{{ default_container_dimensions }}"
####################

1
ansible/roles/rally/handlers/main.yml
View File

@ -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]

1
ansible/roles/rally/tasks/config.yml
View File

@ -84,6 +84,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_rally_containers
when:
- kolla_action != "config"

4
ansible/roles/redis/defaults/main.yml
View File

@ -12,6 +12,7 @@ redis_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ project_name }}:/var/lib/redis/"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ redis_dimensions }}"
redis-sentinel:
container_name: redis_sentinel
group: redis
@ -21,6 +22,7 @@ redis_services:
- "{{ node_config_directory }}/redis-sentinel/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ redis_sentinel_dimensions }}"
####################
# Docker
@ -32,3 +34,5 @@ redis_image_full: "{{ redis_image }}:{{ redis_tag }}"
redis_sentinel_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-redis-sentinel"
redis_sentinel_tag: "{{ openstack_release }}"
redis_sentinel_image_full: "{{ redis_sentinel_image }}:{{ redis_tag }}"
redis_dimensions: "{{ default_container_dimensions }}"
redis_sentinel_dimensions: "{{ default_container_dimensions }}"

2
ansible/roles/redis/handlers/main.yml
View File

@ -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]

1
ansible/roles/redis/tasks/config.yml
View File

@ -48,6 +48,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_redis_containers
when:
- kolla_action != "config"

4
ansible/roles/sahara/defaults/main.yml
View File

@ -13,6 +13,7 @@ sahara_services:
- "sahara:/var/lib/sahara/"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/sahara/sahara:/var/lib/kolla/venv/lib/python2.7/site-packages/sahara' if sahara_dev_mode | bool else '' }}"
dimensions: "{{ sahara_api_dimensions }}"
sahara-engine:
container_name: sahara_engine
group: sahara-engine
@ -26,6 +27,7 @@ sahara_services:
- "kolla_logs:/var/log/kolla/"
- "/run:/run:shared"
- "{{ kolla_dev_repos_directory ~ '/sahara/sahara:/var/lib/kolla/venv/lib/python2.7/site-packages/sahara' if sahara_dev_mode | bool else '' }}"
dimensions: "{{ sahara_engine_dimensions }}"
####################
@ -50,6 +52,8 @@ sahara_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock
sahara_api_tag: "{{ sahara_tag }}"
sahara_api_image_full: "{{ sahara_api_image }}:{{ sahara_api_tag }}"
sahara_api_dimensions: "{{ default_container_dimensions }}"
sahara_engine_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

2
ansible/roles/sahara/handlers/main.yml
View File

@ -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 }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
privileged: "{{ service.privileged | default(False) }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/sahara/tasks/config.yml
View File

@ -91,6 +91,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_sahara_containers
when:
- kolla_action != "config"

5
ansible/roles/searchlight/defaults/main.yml
View File

@ -11,6 +11,7 @@ searchlight_services:
- "{{ node_config_directory }}/searchlight-api/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ searchlight_api_dimensions }}"
searchlight-listener:
container_name: searchlight_listener
group: searchlight-listener
@ -20,6 +21,7 @@ searchlight_services:
- "{{ node_config_directory }}/searchlight-listener/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ searchlight_listener_dimensions }}"
####################
# Elasticsearch
@ -40,6 +42,9 @@ searchlight_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{
searchlight_api_tag: "{{ searchlight_tag }}"
searchlight_api_image_full: "{{ searchlight_api_image }}:{{ searchlight_api_tag }}"
searchlight_api_dimensions: "{{ default_container_dimensions }}"
searchlight_listener_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

2
ansible/roles/searchlight/handlers/main.yml
View File

@ -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]
@ -38,6 +39,7 @@
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/searchlight/tasks/config.yml
View File

@ -86,6 +86,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_searchlight_containers
when:
- kolla_action != "config"

5
ansible/roles/senlin/defaults/main.yml
View File

@ -12,6 +12,7 @@ senlin_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/senlin/senlin:/var/lib/kolla/venv/lib/python2.7/site-packages/senlin' if senlin_dev_mode | bool else '' }}"
dimensions: "{{ senlin_api_dimensions }}"
senlin-engine:
container_name: senlin_engine
group: senlin-engine
@ -22,6 +23,7 @@ senlin_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/senlin/senlin:/var/lib/kolla/venv/lib/python2.7/site-packages/senlin' if senlin_dev_mode | bool else '' }}"
dimensions: "{{ senlin_engine_dimensions }}"
####################
# Database
@ -45,6 +47,9 @@ senlin_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock
senlin_api_tag: "{{ senlin_tag }}"
senlin_api_image_full: "{{ senlin_api_image }}:{{ senlin_api_tag }}"
senlin_api_dimensions: "{{ default_container_dimensions }}"
senlin_engine_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

2
ansible/roles/senlin/handlers/main.yml
View File

@ -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]

1
ansible/roles/senlin/tasks/config.yml
View File

@ -90,6 +90,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_senlin_containers
when:
- kolla_action != "config"

4
ansible/roles/skydive/defaults/main.yml
View File

@ -11,6 +11,7 @@ skydive_services:
- "{{ node_config_directory }}/skydive-analyzer/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ skydive_analyzer_dimensions }}"
skydive-agent:
container_name: skydive_agent
group: skydive-agent
@ -23,6 +24,7 @@ skydive_services:
- "/var/run/openvswitch:/var/run/openvswitch:ro"
- "/var/run/netns:/host/run:shared"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ skydive_agent_dimensions }}"
####################
# Docker
@ -34,3 +36,5 @@ skydive_analyzer_image_full: "{{ skydive_analyzer_image }}:{{ skydive_analyzer_t
skydive_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-skydive-agent"
skydive_agent_tag: "{{ openstack_release }}"
skydive_agent_image_full: "{{ skydive_agent_image }}:{{ skydive_agent_tag }}"
skydive_analyzer_dimensions: "{{ default_container_dimensions }}"
skydive_agent_dimensions: "{{ default_container_dimensions }}"

2
ansible/roles/skydive/handlers/main.yml
View File

@ -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]
@ -36,6 +37,7 @@
image: "{{ service.image }}"
privileged: "{{ service.privileged }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/skydive/tasks/config.yml
View File

@ -51,6 +51,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_skydive_containers
when:
- kolla_action != "config"

8
ansible/roles/solum/defaults/main.yml
View File

@ -12,6 +12,7 @@ solum_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/solum/solum:/var/lib/kolla/venv/lib/python2.7/site-packages/solum' if solum_dev_mode | bool else '' }}"
dimensions: "{{ solum_api_dimensions }}"
solum-worker:
container_name: solum_worker
group: solum-worker
@ -22,6 +23,7 @@ solum_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/solum/solum:/var/lib/kolla/venv/lib/python2.7/site-packages/solum' if solum_dev_mode | bool else '' }}"
dimensions: "{{ solum_worker_dimensions }}"
solum-deployer:
container_name: solum_deployer
group: solum-deployer
@ -32,6 +34,7 @@ solum_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/solum/solum:/var/lib/kolla/venv/lib/python2.7/site-packages/solum' if solum_dev_mode | bool else '' }}"
dimensions: "{{ solum_deployer_dimensions }}"
solum-conductor:
container_name: solum_conductor
group: solum-conductor
@ -42,6 +45,7 @@ solum_services:
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/solum/solum:/var/lib/kolla/venv/lib/python2.7/site-packages/solum' if solum_dev_mode | bool else '' }}"
dimensions: "{{ solum_conductor_dimensions }}"
####################
@ -74,6 +78,10 @@ solum_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docke
solum_api_tag: "{{ solum_tag }}"
solum_api_image_full: "{{ solum_api_image }}:{{ solum_api_tag }}"
solum_api_dimensions: "{{ default_container_dimensions }}"
solum_worker_dimensions: "{{ default_container_dimensions }}"
solum_deployer_dimensions: "{{ default_container_dimensions }}"
solum_conductor_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

4
ansible/roles/solum/handlers/main.yml
View File

@ -13,6 +13,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]
@ -35,6 +36,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]
@ -57,6 +59,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]
@ -79,6 +82,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]

1
ansible/roles/solum/tasks/config.yml
View File

@ -61,6 +61,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_solum_containers
when:
- kolla_action != "config"

5
ansible/roles/tacker/defaults/main.yml
View File

@ -12,6 +12,7 @@ tacker_services:
- "{{ kolla_dev_repos_directory ~ '/tacker/tacker:/var/lib/kolla/venv/lib/python2.7/site-packages/tacker' if tacker_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ tacker_server_dimensions }}"
tacker-conductor:
container_name: "tacker_conductor"
group: "tacker-conductor"
@ -22,6 +23,7 @@ tacker_services:
- "{{ kolla_dev_repos_directory ~ '/tacker/tacker:/var/lib/kolla/venv/lib/python2.7/site-packages/tacker' if tacker_dev_mode | bool else '' }}"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ tacker_conductor_dimensions }}"
####################
# Database
@ -44,6 +46,9 @@ tacker_conductor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
tacker_conductor_tag: "{{ tacker_tag }}"
tacker_conductor_image_full: "{{ tacker_conductor_image }}:{{ tacker_conductor_tag }}"
tacker_server_dimensions: "{{ default_container_dimensions }}"
tacker_conductor_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack
####################

2
ansible/roles/tacker/handlers/main.yml
View File

@ -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]

1
ansible/roles/tacker/tasks/config.yml
View File

@ -89,6 +89,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]

4
ansible/roles/telegraf/defaults/main.yml
View File

@ -15,7 +15,7 @@ telegraf_services:
- "/sys:/rootfs/sys:ro"
- "/proc:/rootfs/proc:ro"
- "/var/run/docker.sock:/var/run/docker.sock:ro"
dimensions: "{{ telegraf_dimensions }}"
####################
# Docker
@ -23,7 +23,7 @@ telegraf_services:
telegraf_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-telegraf"
telegraf_tag: "{{ openstack_release }}"
telegraf_image_full: "{{ telegraf_image }}:{{ telegraf_tag }}"
telegraf_dimensions: "{{ default_container_dimensions }}"
####################
# Protocols

1
ansible/roles/telegraf/handlers/main.yml
View File

@ -16,6 +16,7 @@
HOST_SYS: "/rootfs/sys"
image: "{{ service.image }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/telegraf/tasks/config.yml
View File

@ -71,6 +71,7 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
pid_mode: "{{ item.value.pid_mode }}"
dimensions: "{{ item.value.dimensions }}"
register: check_telegraf_containers
when:
- kolla_action != "config"

3
ansible/roles/tempest/defaults/main.yml
View File

@ -11,6 +11,7 @@ tempest_services:
- "{{ node_config_directory }}/tempest/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ tempest_dimensions }}"
########
@ -19,7 +20,7 @@ tempest_services:
tempest_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-tempest"
tempest_tag: "{{ openstack_release }}"
tempest_image_full: "{{ tempest_image }}:{{ tempest_tag }}"
tempest_dimensions: "{{ default_container_dimensions }}"
###########################
# Tempest Required Resource

1
ansible/roles/tempest/handlers/main.yml
View File

@ -13,6 +13,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]

1
ansible/roles/tempest/tasks/config.yml
View File

@ -52,6 +52,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_tempest_containers
when:
- kolla_action != "config"

7
ansible/roles/trove/defaults/main.yml
View File

@ -13,6 +13,7 @@ trove_services:
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/trove/trove:/var/lib/kolla/venv/lib/python2.7/site-packages/trove' if trove_dev_mode | bool else '' }}"
- "trove:/var/lib/trove/"
dimensions: "{{ trove_api_dimensions }}"
trove-conductor:
container_name: trove_conductor
group: trove-conductor
@ -24,6 +25,7 @@ trove_services:
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/trove/trove:/var/lib/kolla/venv/lib/python2.7/site-packages/trove' if trove_dev_mode | bool else '' }}"
- "trove:/var/lib/trove/"
dimensions: "{{ trove_conductor_dimensions }}"
trove-taskmanager:
container_name: trove_taskmanager
group: trove-taskmanager
@ -35,6 +37,7 @@ trove_services:
- "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/trove/trove:/var/lib/kolla/venv/lib/python2.7/site-packages/trove' if trove_dev_mode | bool else '' }}"
- "trove:/var/lib/trove/"
dimensions: "{{ trove_taskmanager_dimensions }}"
####################
@ -63,6 +66,10 @@ trove_taskmanager_image: "{{ docker_registry ~ '/' if docker_registry else '' }}
trove_taskmanager_tag: "{{ trove_tag }}"
trove_taskmanager_image_full: "{{ trove_taskmanager_image }}:{{ trove_taskmanager_tag }}"
trove_api_dimensions: "{{ default_container_dimensions }}"
trove_conductor_dimensions: "{{ default_container_dimensions }}"
trove_taskmanager_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack

3
ansible/roles/trove/handlers/main.yml
View File

@ -13,6 +13,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]
@ -35,6 +36,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]
@ -57,6 +59,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]

1
ansible/roles/trove/tasks/config.yml
View File

@ -79,6 +79,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_trove_containers
when:
- kolla_action != "config"

11
ansible/roles/vitrage/defaults/main.yml
View File

@ -12,6 +12,7 @@ vitrage_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/vitrage/vitrage:/var/lib/kolla/venv/lib/python2.7/site-packages/vitrage' if vitrage_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ vitrage_api_dimensions }}"
vitrage-collector:
container_name: vitrage_collector
group: vitrage-collector
@ -22,6 +23,7 @@ vitrage_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/vitrage/vitrage:/var/lib/kolla/venv/lib/python2.7/site-packages/vitrage' if vitrage_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ vitrage_collector_dimensions }}"
vitrage-notifier:
container_name: vitrage_notifier
group: vitrage-notifier
@ -32,6 +34,7 @@ vitrage_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/vitrage/vitrage:/var/lib/kolla/venv/lib/python2.7/site-packages/vitrage' if vitrage_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ vitrage_notifier_dimensions }}"
vitrage-graph:
container_name: vitrage_graph
group: vitrage-graph
@ -42,6 +45,7 @@ vitrage_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/vitrage/vitrage:/var/lib/kolla/venv/lib/python2.7/site-packages/vitrage' if vitrage_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ vitrage_graph_dimensions }}"
vitrage-ml:
container_name: vitrage_ml
group: vitrage-ml
@ -52,6 +56,7 @@ vitrage_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/vitrage/vitrage:/var/lib/kolla/venv/lib/python2.7/site-packages/vitrage' if vitrage_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ vitrage_ml_dimensions }}"
####################
## Database
@ -87,6 +92,12 @@ vitrage_ml_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ dock
vitrage_ml_tag: "{{ vitrage_tag }}"
vitrage_ml_image_full: "{{ vitrage_ml_image }}:{{ vitrage_ml_tag }}"
vitrage_api_dimensions: "{{ default_container_dimensions }}"
vitrage_notifier_dimensions: "{{ default_container_dimensions }}"
vitrage_collector_dimensions: "{{ default_container_dimensions }}"
vitrage_graph_dimensions: "{{ default_container_dimensions }}"
vitrage_ml_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack
####################

5
ansible/roles/vitrage/handlers/main.yml
View File

@ -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]
@ -86,6 +89,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]
@ -110,6 +114,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]

1
ansible/roles/vitrage/tasks/config.yml
View File

@ -111,6 +111,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes | reject('equalto', '') | list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_vitrage_containers
when:
- kolla_action != "config"

2
ansible/roles/vmtp/defaults/main.yml
View File

@ -10,6 +10,7 @@ vmtp_services:
volumes:
- "{{ node_config_directory }}/vmtp/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
dimensions: "{{ vmtp_dimensions }}"
####################
# Docker
@ -17,6 +18,7 @@ vmtp_services:
vmtp_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-vmtp"
vmtp_tag: "{{ openstack_release }}"
vmtp_image_full: "{{ vmtp_image }}:{{ vmtp_tag }}"
vmtp_dimensions: "{{ default_container_dimensions }}"
#########################
# VMTP Specific resources

1
ansible/roles/vmtp/handlers/main.yml
View File

@ -11,6 +11,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]

1
ansible/roles/vmtp/tasks/config.yml
View File

@ -50,6 +50,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
register: check_vmtp_containers
when:
- kolla_action != "config"

7
ansible/roles/watcher/defaults/main.yml
View File

@ -12,6 +12,7 @@ watcher_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/watcher/watcher:/var/lib/kolla/venv/lib/python2.7/site-packages/watcher' if watcher_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ watcher_api_dimensions }}"
watcher-applier:
container_name: watcher_applier
group: watcher-applier
@ -22,6 +23,7 @@ watcher_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/watcher/watcher:/var/lib/kolla/venv/lib/python2.7/site-packages/watcher' if watcher_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ watcher_applier_dimensions }}"
watcher-engine:
container_name: watcher_engine
group: watcher-engine
@ -32,6 +34,7 @@ watcher_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/watcher/watcher:/var/lib/kolla/venv/lib/python2.7/site-packages/watcher' if watcher_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ watcher_engine_dimensions }}"
####################
@ -60,6 +63,10 @@ watcher_applier_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{
watcher_applier_tag: "{{ watcher_tag }}"
watcher_applier_image_full: "{{ watcher_applier_image }}:{{ watcher_applier_tag }}"
watcher_api_dimensions: "{{ default_container_dimensions }}"
watcher_applier_dimensions: "{{ default_container_dimensions }}"
watcher_engine_dimensions: "{{ default_container_dimensions }}"
####################
# OpenStack
####################

3
ansible/roles/watcher/handlers/main.yml
View File

@ -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]

1
ansible/roles/watcher/tasks/config.yml
View File

@ -89,6 +89,7 @@
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_watcher_containers
when:
- kolla_action != "config"

2
ansible/roles/zookeeper/defaults/main.yml
View File

@ -13,6 +13,7 @@ zookeeper_services:
- "/etc/localtime:/etc/localtime:ro"
- "zookeeper:/var/lib/zookeeper/data"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ zookeeper_dimensions }}"
####################
# Zookeeper
@ -26,3 +27,4 @@ zookeeper_install_type: "{{ kolla_install_type }}"
zookeeper_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ zookeeper_install_type }}-zookeeper"
zookeeper_tag: "{{ openstack_release }}"
zookeeper_image_full: "{{ zookeeper_image }}:{{ zookeeper_tag }}"
zookeeper_dimensions: "{{ default_container_dimensions }}"

1
ansible/roles/zookeeper/handlers/main.yml
View File

@ -15,6 +15,7 @@
image: "{{ service.image }}"
environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]

1
ansible/roles/zookeeper/tasks/config.yml
View File

@ -67,6 +67,7 @@
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
environment: "{{ item.value.environment }}"
dimensions: "{{ item.value.dimensions }}"
register: check_zookeeper_containers
when:
- kolla_action != "config"

7
ansible/roles/zun/defaults/main.yml
View File

@ -12,6 +12,7 @@ zun_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/zun/zun:/var/lib/kolla/venv/lib/python2.7/site-packages/zun' if zun_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ zun_api_dimensions }}"
zun-wsproxy:
container_name: zun_wsproxy
group: zun-wsproxy
@ -22,6 +23,7 @@ zun_services:
- "/etc/localtime:/etc/localtime:ro"
- "{{ kolla_dev_repos_directory ~ '/zun/zun:/var/lib/kolla/venv/lib/python2.7/site-packages/zun' if zun_dev_mode | bool else '' }}"
- "kolla_logs:/var/log/kolla/"
dimensions: "{{ zun_wsproxy_dimensions }}"
zun-compute:
container_name: zun_compute
group: zun-compute
@ -35,6 +37,7 @@ zun_services:
- "{{ kolla_dev_repos_directory ~ '/zun/zun:/var/lib/kolla/venv/lib/python2.7/site-packages/zun' if zun_dev_mode | bool else '' }}"
- "/run:/run:shared"
- "/usr/lib/docker:/usr/lib/docker"
dimensions: "{{ zun_compute_dimensions }}"
####################
## Database
@ -62,6 +65,10 @@ zun_compute_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ doc
zun_compute_tag: "{{ zun_tag }}"
zun_compute_image_full: "{{ zun_compute_image }}:{{ zun_compute_tag }}"
zun_api_dimensions: "{{ default_container_dimensions }}"
zun_wsproxy_dimensions: "{{ default_container_dimensions }}"
zun_compute_dimensions: "{{ default_container_dimensions }}"
####################
## OpenStack

3
ansible/roles/zun/handlers/main.yml
View File

@ -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]
@ -40,6 +41,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]
@ -65,6 +67,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]

1
ansible/roles/zun/tasks/config.yml
View File

@ -108,6 +108,7 @@
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
dimensions: "{{ item.value.dimensions }}"
register: check_zun_containers
when:
- kolla_action != "config"