openstack/kolla-ansible
Code Issues Proposed changes

Performance: Run common role in a separate play

Browse Source 
The common role was previously added as a dependency to all other roles.
It would set a fact after running on a host to avoid running twice. This
had the nice effect that deploying any service would automatically pull
in the common services for that host. When using tags, any services with
matching tags would also run the common role. This could be both
surprising and sometimes useful.

When using Ansible at large scale, there is a penalty associated with
executing a task against a large number of hosts, even if it is skipped.
The common role introduces some overhead, just in determining that it
has already run.

This change extracts the common role into a separate play, and removes
the dependency on it from all other roles. New groups have been added
for cron, fluentd, and kolla-toolbox, similar to other services. This
changes the behaviour in the following ways:

* The common role is now run for all hosts at the beginning, rather than
  prior to their first enabled service
* Hosts must be in the necessary group for each of the common services
  in order to have that service deployed. This is mostly to avoid
  deploying on localhost or the deployment host
* If tags are specified for another service e.g. nova, the common role
  will *not* automatically run for matching hosts. The common tag must
  be specified explicitly

The last of these is probably the largest behaviour change. While it
would be possible to determine which hosts should automatically run the
common role, it would be quite complex, and would introduce some
overhead that would probably negate the benefit of splitting out the
common role.

Partially-Implements: blueprint performance-improvements

Change-Id: I6a4676bf6efeebc61383ec7a406db07c7a868b2a
This commit is contained in:
Mark Goddard 2020-06-30 11:05:01 +01:00
parent 904f1c9bd9
commit 56ae2db7ac
78 changed files with 159 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ansible/inventory/all-in-one
View File

@ -20,10 +20,19 @@ localhost ansible_connection=local
# You can explicitly specify which hosts run each project by updating the # You can explicitly specify which hosts run each project by updating the
# groups in the sections below. Common services are grouped together. # groups in the sections below. Common services are grouped together.
[common:children]
control
network
compute
storage
monitoring
[chrony-server:children] [chrony-server:children]
haproxy haproxy
[chrony:children] [chrony:children]
control
network network
compute compute
storage storage
@ -250,6 +259,19 @@ control
# function appropriately. For example, neutron-metadata-agent must run on the # function appropriately. For example, neutron-metadata-agent must run on the
# same host as the l3-agent and (depending on configuration) the dhcp-agent. # same host as the l3-agent and (depending on configuration) the dhcp-agent.
# Common
[cron:children]
common
[fluentd:children]
common
[kolla-logs:children]
common
[kolla-toolbox:children]
common
# Elasticsearch Curator # Elasticsearch Curator
[elasticsearch-curator:children] [elasticsearch-curator:children]
elasticsearch elasticsearch

21
ansible/inventory/multinode
View File

@ -44,6 +44,14 @@ control
# You can explicitly specify which hosts run each project by updating the # You can explicitly specify which hosts run each project by updating the
# groups in the sections below. Common services are grouped together. # groups in the sections below. Common services are grouped together.
[common:children]
control
network
compute
storage
monitoring
[chrony-server:children] [chrony-server:children]
haproxy haproxy
@ -269,6 +277,19 @@ control
# function appropriately. For example, neutron-metadata-agent must run on the # function appropriately. For example, neutron-metadata-agent must run on the
# same host as the l3-agent and (depending on configuration) the dhcp-agent. # same host as the l3-agent and (depending on configuration) the dhcp-agent.
# Common
[cron:children]
common
[fluentd:children]
common
[kolla-logs:children]
common
[kolla-toolbox:children]
common
# Elasticsearch Curator # Elasticsearch Curator
[elasticsearch-curator:children] [elasticsearch-curator:children]
elasticsearch elasticsearch

3
ansible/roles/aodh/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/barbican/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/blazar/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/ceilometer/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/chrony/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/cinder/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/cloudkitty/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/collectd/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

10
ansible/roles/common/defaults/main.yml
View File

@ -1,14 +1,10 @@
--- ---
project_name: "common" project_name: "common"
# Due to the way we do our inventory, ansible does not pick up on the fact that
# this role has already run. We can track what has run with host facts.
common_run: False
common_services: common_services:
fluentd: fluentd:
container_name: fluentd container_name: fluentd
group: all group: fluentd
enabled: "{{ enable_fluentd | bool }}" enabled: "{{ enable_fluentd | bool }}"
image: "{{ fluentd_image_full }}" image: "{{ fluentd_image_full }}"
environment: environment:
@ -17,7 +13,7 @@ common_services:
dimensions: "{{ fluentd_dimensions }}" dimensions: "{{ fluentd_dimensions }}"
kolla-toolbox: kolla-toolbox:
container_name: kolla_toolbox container_name: kolla_toolbox
group: all group: kolla-toolbox
enabled: True enabled: True
image: "{{ kolla_toolbox_image_full }}" image: "{{ kolla_toolbox_image_full }}"
environment: environment:
@ -29,7 +25,7 @@ common_services:
# DUMMY_ENVIRONMENT is needed because empty environment is not supported # DUMMY_ENVIRONMENT is needed because empty environment is not supported
cron: cron:
container_name: cron container_name: cron
group: all group: cron
enabled: True enabled: True
image: "{{ cron_image_full }}" image: "{{ cron_image_full }}"
environment: environment:

2
ansible/roles/common/tasks/bootstrap.yml
View File

@ -5,6 +5,7 @@
action: "create_volume" action: "create_volume"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "kolla_logs" name: "kolla_logs"
when: inventory_hostname in groups['kolla-logs']
- name: Link kolla_logs volume to /var/log/kolla - name: Link kolla_logs volume to /var/log/kolla
become: true become: true
@ -12,3 +13,4 @@
src: "{{ docker_runtime_directory or '/var/lib/docker' }}/volumes/kolla_logs/_data" src: "{{ docker_runtime_directory or '/var/lib/docker' }}/volumes/kolla_logs/_data"
path: /var/log/kolla path: /var/log/kolla
state: link state: link
when: inventory_hostname in groups['kolla-logs']

2
ansible/roles/common/tasks/check-containers.yml
View File

@ -11,7 +11,7 @@
privileged: "{{ item.value.privileged | default(False) }}" privileged: "{{ item.value.privileged | default(False) }}"
environment: "{{ item.value.environment }}" environment: "{{ item.value.environment }}"
when: when:
- item.value.enabled | bool - item.value | service_enabled_and_mapped_to_host
with_dict: "{{ common_services }}" with_dict: "{{ common_services }}"
notify: notify:
- "Restart {{ item.key }} container" - "Restart {{ item.key }} container"

96
ansible/roles/common/tasks/config.yml
View File

@ -1,30 +1,32 @@
--- ---
- name: Ensuring config directories exist - name: Ensuring config directories exist
vars:
service_name: "{{ item.0.service_name }}"
service: "{{ common_services[service_name] }}"
file: file:
path: "{{ node_config_directory }}/{{ item }}" path: "{{ node_config_directory }}/{{ item.1 }}"
state: "directory" state: "directory"
owner: "{{ config_owner_user }}" owner: "{{ config_owner_user }}"
group: "{{ config_owner_group }}" group: "{{ config_owner_group }}"
mode: "0770" mode: "0770"
become: true become: true
with_items: with_subelements:
- "kolla-toolbox" - - service_name: "cron"
- "cron" paths:
- "cron/logrotate" - "cron"
- "cron/logrotate"
- name: Ensuring fluentd config directories exist - service_name: "fluentd"
file: paths:
path: "{{ node_config_directory }}/{{ item }}" - "fluentd"
state: "directory" - "fluentd/input"
mode: "0770" - "fluentd/output"
become: true - "fluentd/format"
with_items: - "fluentd/filter"
- "fluentd" - service_name: "kolla-toolbox"
- "fluentd/input" paths:
- "fluentd/output" - "kolla-toolbox"
- "fluentd/format" - paths
- "fluentd/filter" when: service | service_enabled_and_mapped_to_host
when: enable_fluentd | bool
- name: Ensure fluentd image is present for label check - name: Ensure fluentd image is present for label check
vars: vars:
@ -35,7 +37,7 @@
action: "ensure_image" action: "ensure_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ service.image }}" image: "{{ service.image }}"
when: enable_fluentd | bool when: service | service_enabled_and_mapped_to_host
- name: Fetch fluentd image labels - name: Fetch fluentd image labels
vars: vars:
@ -45,12 +47,12 @@
docker_image_info: docker_image_info:
name: "{{ service.image }}" name: "{{ service.image }}"
register: fluentd_labels register: fluentd_labels
when: enable_fluentd | bool when: service | service_enabled_and_mapped_to_host
- name: Set fluentd facts - name: Set fluentd facts
set_fact: set_fact:
fluentd_binary: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_binary }}" fluentd_binary: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_binary }}"
when: enable_fluentd | bool when: common_services.fluentd | service_enabled_and_mapped_to_host
- include_tasks: copy-certs.yml - include_tasks: copy-certs.yml
when: when:
@ -62,7 +64,7 @@
dest: "{{ node_config_directory }}/{{ item.key }}/config.json" dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660" mode: "0660"
become: true become: true
when: item.value.enabled | bool when: item.value | service_enabled_and_mapped_to_host
with_dict: "{{ common_services }}" with_dict: "{{ common_services }}"
notify: notify:
- "Restart {{ item.key }} container" - "Restart {{ item.key }} container"
@ -74,8 +76,7 @@
run_once: True run_once: True
register: find_custom_fluentd_inputs register: find_custom_fluentd_inputs
delegate_to: localhost delegate_to: localhost
when: when: common_services.fluentd | service_enabled_and_mapped_to_host
- enable_fluentd | bool
- name: Copying over fluentd input config files - name: Copying over fluentd input config files
vars: vars:
@ -86,7 +87,7 @@
mode: "0660" mode: "0660"
become: true become: true
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- item ~ '.conf' not in customised_input_files - item ~ '.conf' not in customised_input_files
with_items: with_items:
- "00-global" - "00-global"
@ -107,7 +108,7 @@
dest: "{{ node_config_directory }}/fluentd/input/{{ item.path | basename }}" dest: "{{ node_config_directory }}/fluentd/input/{{ item.path | basename }}"
mode: "0660" mode: "0660"
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
with_items: "{{ find_custom_fluentd_inputs.files }}" with_items: "{{ find_custom_fluentd_inputs.files }}"
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -117,6 +118,8 @@
log_direct_to_elasticsearch: "{{ ( enable_elasticsearch | bool or log_direct_to_elasticsearch: "{{ ( enable_elasticsearch | bool or
( elasticsearch_address != kolla_internal_vip_address )) and ( elasticsearch_address != kolla_internal_vip_address )) and
not enable_monasca | bool }}" not enable_monasca | bool }}"
when:
- common_services.fluentd | service_enabled_and_mapped_to_host
- name: Find custom fluentd output config files - name: Find custom fluentd output config files
find: find:
@ -126,7 +129,7 @@
register: find_custom_fluentd_outputs register: find_custom_fluentd_outputs
delegate_to: localhost delegate_to: localhost
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- name: Copying over fluentd output config files - name: Copying over fluentd output config files
vars: vars:
@ -137,7 +140,7 @@
mode: "0660" mode: "0660"
become: true become: true
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- item.enabled | bool - item.enabled | bool
- item.name ~ '.conf' not in customised_output_files - item.name ~ '.conf' not in customised_output_files
with_items: with_items:
@ -156,7 +159,7 @@
state: "absent" state: "absent"
become: true become: true
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- item.disable | bool - item.disable | bool
with_items: with_items:
- name: "02-monasca" - name: "02-monasca"
@ -173,7 +176,7 @@
mode: "0660" mode: "0660"
become: true become: true
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
with_items: "{{ find_custom_fluentd_outputs.files }}" with_items: "{{ find_custom_fluentd_outputs.files }}"
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -186,7 +189,7 @@
register: find_custom_fluentd_format register: find_custom_fluentd_format
delegate_to: localhost delegate_to: localhost
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- name: Copying over fluentd format config files - name: Copying over fluentd format config files
vars: vars:
@ -200,7 +203,7 @@
- "apache_access" - "apache_access"
- "wsgi_access" - "wsgi_access"
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- item ~ '.conf' not in customised_format_files - item ~ '.conf' not in customised_format_files
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -211,7 +214,7 @@
dest: "{{ node_config_directory }}/fluentd/format/{{ item.path | basename }}" dest: "{{ node_config_directory }}/fluentd/format/{{ item.path | basename }}"
mode: "0660" mode: "0660"
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
with_items: "{{ find_custom_fluentd_format.files }}" with_items: "{{ find_custom_fluentd_format.files }}"
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -223,7 +226,7 @@
run_once: True run_once: True
register: find_custom_fluentd_filters register: find_custom_fluentd_filters
delegate_to: localhost delegate_to: localhost
when: enable_fluentd | bool when: common_services.fluentd | service_enabled_and_mapped_to_host
- name: Copying over fluentd filter config files - name: Copying over fluentd filter config files
vars: vars:
@ -242,7 +245,7 @@
- src: 02-parser - src: 02-parser
dest: 02-parser dest: 02-parser
when: when:
- enable_fluentd | bool - common_services.fluentd | service_enabled_and_mapped_to_host
- item.src ~ '.conf' not in customised_filter_files - item.src ~ '.conf' not in customised_filter_files
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -254,7 +257,8 @@
mode: "0660" mode: "0660"
become: true become: true
with_items: "{{ find_custom_fluentd_filters.files }}" with_items: "{{ find_custom_fluentd_filters.files }}"
when: enable_fluentd | bool when:
- common_services.fluentd | service_enabled_and_mapped_to_host
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -266,7 +270,7 @@
become: true become: true
with_items: with_items:
- "fluentd" - "fluentd"
when: enable_fluentd | bool when: common_services.fluentd | service_enabled_and_mapped_to_host
notify: notify:
- Restart fluentd container - Restart fluentd container
@ -276,7 +280,9 @@
dest: "{{ node_config_directory }}/cron/logrotate/{{ item.name }}.conf" dest: "{{ node_config_directory }}/cron/logrotate/{{ item.name }}.conf"
mode: "0660" mode: "0660"
become: true become: true
when: item.enabled | bool when:
- common_services.cron | service_enabled_and_mapped_to_host
- item.enabled | bool
with_items: with_items:
- { name: "ansible", enabled: "yes" } - { name: "ansible", enabled: "yes" }
- { name: "aodh", enabled: "{{ enable_aodh }}" } - { name: "aodh", enabled: "{{ enable_aodh }}" }
@ -348,7 +354,9 @@
content: "{{ rabbitmq_cluster_cookie }}" content: "{{ rabbitmq_cluster_cookie }}"
dest: "{{ node_config_directory }}/kolla-toolbox/rabbitmq-erlang.cookie" dest: "{{ node_config_directory }}/kolla-toolbox/rabbitmq-erlang.cookie"
mode: "0660" mode: "0660"
when: enable_rabbitmq | bool when:
- common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
- enable_rabbitmq | bool
notify: notify:
- Restart kolla-toolbox container - Restart kolla-toolbox container
@ -361,7 +369,7 @@
mode: "0770" mode: "0770"
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"
when: when:
- item.value.enabled | bool - item.value | service_enabled_and_mapped_to_host
- item.key != "kolla-toolbox" - item.key != "kolla-toolbox"
with_dict: "{{ common_services }}" with_dict: "{{ common_services }}"
@ -374,7 +382,8 @@
mode: "0600" mode: "0600"
become: true become: true
when: when:
api_address_family == "ipv6" - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
- api_address_family == "ipv6"
- name: Copy rabbitmq erl_intr to kolla toolbox - name: Copy rabbitmq erl_intr to kolla toolbox
copy: copy:
@ -384,7 +393,8 @@
mode: "0600" mode: "0600"
become: true become: true
when: when:
api_address_family == "ipv6" - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
- api_address_family == "ipv6"
- include_tasks: check-containers.yml - include_tasks: check-containers.yml
when: kolla_action != "config" when: kolla_action != "config"

8
ansible/roles/common/tasks/main.yml
View File

@ -1,10 +1,2 @@
--- ---
- include_tasks: "{{ kolla_action }}.yml" - include_tasks: "{{ kolla_action }}.yml"
tags: common
when: not common_run
- name: Registering common role has run
set_fact:
common_run: True
tags: common
when: not common_run

2
ansible/roles/common/tasks/pull.yml
View File

@ -6,5 +6,5 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
when: when:
- item.value.enabled | bool - item.value | service_enabled_and_mapped_to_host
with_dict: "{{ common_services }}" with_dict: "{{ common_services }}"

3
ansible/roles/cyborg/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/designate/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/elasticsearch/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/etcd/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/freezer/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/glance/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/gnocchi/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/grafana/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/haproxy/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/heat/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/horizon/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/influxdb/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/ironic/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/iscsi/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/kafka/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/karbor/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/keystone/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/kibana/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/kuryr/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/magnum/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/manila/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/mariadb/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/masakari/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/mistral/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/monasca/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/murano/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/neutron/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/nova-cell/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/nova-hyperv/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/nova/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/octavia/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/openvswitch/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/ovn/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/ovs-dpdk/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/panko/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/placement/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/prometheus/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

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

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/qinling/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/rabbitmq/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/rally/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/redis/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/sahara/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/searchlight/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/senlin/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/skydive/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/solum/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/storm/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/swift/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/tacker/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/telegraf/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

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

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

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

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/vitrage/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/vmtp/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

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

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

3
ansible/roles/zookeeper/meta/main.yml
View File

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

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

@ -1,3 +0,0 @@
---
dependencies:
- { role: common }

13
ansible/site.yml
View File

@ -92,6 +92,19 @@
roles: roles:
- role: prechecks - role: prechecks
- name: Apply role common
gather_facts: false
hosts:
- cron
- fluentd
- kolla-logs
- kolla-toolbox
serial: '{{ kolla_serial|default("0") }}'
tags:
- common
roles:
- role: common
- name: Apply role chrony - name: Apply role chrony
gather_facts: false gather_facts: false
hosts: hosts:

20
releasenotes/notes/separate-common-play-09a1aa1ac7d0797a.yaml Normal file
View File

@ -0,0 +1,20 @@
---
features:
- |
Extracts the common role into a separate play. This provides a performance
benefit at scale, since the role dependency mechanism used previously had a
overhead. This change allows the only common role to be executed by
specifying the ``common`` tag.
upgrade:
- |
The common role is now executed in a separate play. This introduces a few
small changes in behaviour:
* the common role is now run for all hosts at the beginning, rather than
prior to their first enabled service
* hosts must be in the necessary group for each of the common services
(``cron``, ``fluentd``, ``kolla-logs``, ``kolla-toolbox``) in order to
have that service deployed
* if tags are specified for another service e.g. nova, the common role
will *not* automatically run for matching hosts. The common tag must
be specified explicitly

21
tests/templates/inventory.j2
View File

@ -58,6 +58,14 @@ control
# You can explicitly specify which hosts run each project by updating the # You can explicitly specify which hosts run each project by updating the
# groups in the sections below. Common services are grouped together. # groups in the sections below. Common services are grouped together.
[common:children]
control
network
compute
storage
monitoring
[chrony-server:children] [chrony-server:children]
haproxy haproxy
@ -283,6 +291,19 @@ control
# function appropriately. For example, neutron-metadata-agent must run on the # function appropriately. For example, neutron-metadata-agent must run on the
# same host as the l3-agent and (depending on configuration) the dhcp-agent. # same host as the l3-agent and (depending on configuration) the dhcp-agent.
# Common
[cron:children]
common
[fluentd:children]
common
[kolla-logs:children]
common
[kolla-toolbox:children]
common
# Elasticsearch Curator # Elasticsearch Curator
[elasticsearch-curator:children] [elasticsearch-curator:children]
elasticsearch elasticsearch

4
tools/kolla-ansible
View File

@ -339,12 +339,12 @@ case "$1" in
;; ;;
(mariadb_recovery) (mariadb_recovery)
ACTION="Attempting to restart mariadb cluster" ACTION="Attempting to restart mariadb cluster"
EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=deploy -e common_run=true" EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=deploy"
PLAYBOOK="${BASEDIR}/ansible/mariadb_recovery.yml" PLAYBOOK="${BASEDIR}/ansible/mariadb_recovery.yml"
;; ;;
(mariadb_backup) (mariadb_backup)
ACTION="Backup MariaDB databases" ACTION="Backup MariaDB databases"
EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=backup -e mariadb_backup_type=${BACKUP_TYPE} -e common_run=true" EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=backup -e mariadb_backup_type=${BACKUP_TYPE}"
PLAYBOOK="${BASEDIR}/ansible/mariadb_backup.yml" PLAYBOOK="${BASEDIR}/ansible/mariadb_backup.yml"
;; ;;
(destroy) (destroy)