fb3a8f5fa9
Most roles are not leveraging the jinja filters available. According to [1] filtering the list of services makes the execution faster than skipping the tasks. This patchset also includes some cosmetic changes to genconfig. Individual services are now also using a jinja filter. This has no impact on performance, just makes the tasks look cleaner. Naming of some vars in genconfig was changed to "service" to make the tasks more uniform as some were previously using the service name and some were using "service". Three metrics from the deployment were taken and those were - overall deployment time [s] - time spent on the specific role [s] - CPU usage (measured with perf) [-] Overall genconfig time went down on avg. from 209s to 195s Time spent on the loadbalancer role went down on avg. from 27s to 23s Time spent on the neutron role went down on avg from 102s to 95s Time spent on the nova-cell role went down on avg. from 54s to 52s Also the average CPUs utilized reported by perf went down from 3.31 to 3.15. For details of how this was measured see the comments in gerrit. [1] - https://github.com/stackhpc/ansible-scaling/blob/master/doc/skip.md Change-Id: Ib0f00aadb6c7022de6e8b455ac4b9b8cd6be5b1b Signed-off-by: Roman Krček <roman.krcek@tietoevry.com>
141 lines
4.5 KiB
YAML
141 lines
4.5 KiB
YAML
---
|
|
- name: Ensuring config directories exist
|
|
file:
|
|
path: "{{ node_config_directory }}/{{ item.key }}"
|
|
state: "directory"
|
|
owner: "{{ config_owner_user }}"
|
|
group: "{{ config_owner_group }}"
|
|
mode: "0770"
|
|
become: true
|
|
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
|
|
|
|
- name: Check if policies shall be overwritten
|
|
stat:
|
|
path: "{{ item }}"
|
|
delegate_to: localhost
|
|
run_once: True
|
|
register: masakari_policy
|
|
with_first_found:
|
|
- files: "{{ supported_policy_format_list }}"
|
|
paths:
|
|
- "{{ node_custom_config }}/masakari/"
|
|
skip: true
|
|
|
|
- name: Set masakari policy file
|
|
set_fact:
|
|
masakari_policy_file: "{{ masakari_policy.results.0.stat.path | basename }}"
|
|
masakari_policy_file_path: "{{ masakari_policy.results.0.stat.path }}"
|
|
when:
|
|
- masakari_policy.results
|
|
|
|
- name: Copying over existing policy file
|
|
template:
|
|
src: "{{ masakari_policy_file_path }}"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/{{ masakari_policy_file }}"
|
|
mode: "0660"
|
|
become: true
|
|
when:
|
|
- masakari_policy_file is defined
|
|
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- Restart {{ item.key }} container
|
|
|
|
- name: Copying over config.json files for services
|
|
template:
|
|
src: "{{ item.key }}.json.j2"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
|
|
mode: "0660"
|
|
become: true
|
|
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- Restart {{ item.key }} container
|
|
|
|
- include_tasks: copy-certs.yml
|
|
when:
|
|
- kolla_copy_ca_into_containers | bool
|
|
|
|
- name: Copying over masakari.conf
|
|
vars:
|
|
service_name: "{{ item }}"
|
|
service: "{{ masakari_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/masakari.conf.j2"
|
|
- "{{ node_custom_config }}/global.conf"
|
|
- "{{ node_custom_config }}/masakari.conf"
|
|
- "{{ node_custom_config }}/masakari/{{ service_name }}.conf"
|
|
- "{{ node_custom_config }}/masakari/{{ inventory_hostname }}/masakari.conf"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/masakari.conf"
|
|
mode: "0660"
|
|
become: true
|
|
when: service | service_enabled_and_mapped_to_host
|
|
with_items:
|
|
- masakari-api
|
|
- masakari-engine
|
|
notify:
|
|
- Restart {{ service_name }} container
|
|
|
|
- name: Copying over masakari-monitors.conf
|
|
vars:
|
|
service_name: "{{ item }}"
|
|
service: "{{ masakari_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/masakari-monitors.conf.j2"
|
|
- "{{ node_custom_config }}/global.conf"
|
|
- "{{ node_custom_config }}/masakari/{{ service_name }}.conf"
|
|
- "{{ node_custom_config }}/masakari/masakari-monitors.conf"
|
|
- "{{ node_custom_config }}/masakari/{{ inventory_hostname }}/masakari-monitors.conf"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/masakari-monitors.conf"
|
|
mode: "0660"
|
|
become: true
|
|
when: service | service_enabled_and_mapped_to_host
|
|
with_items:
|
|
- masakari-instancemonitor
|
|
- masakari-hostmonitor
|
|
notify:
|
|
- Restart {{ service_name }} container
|
|
|
|
- name: Copying over wsgi-masakari file for services
|
|
vars:
|
|
service: "{{ masakari_services['masakari-api'] }}"
|
|
template:
|
|
src: "wsgi-masakari.conf.j2"
|
|
dest: "{{ node_config_directory }}/masakari-api/wsgi-masakari.conf"
|
|
mode: "0660"
|
|
become: true
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- Restart masakari-api container
|
|
|
|
- name: Copying over masakari-api-paste.ini
|
|
vars:
|
|
service: "{{ masakari_services['masakari-api'] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/masakari-api-paste.ini.j2"
|
|
- "{{ node_custom_config }}/masakari/masakari-api/masakari-api-paste.ini"
|
|
dest: "{{ node_config_directory }}/masakari-api/masakari-api-paste.ini"
|
|
mode: "0660"
|
|
become: true
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- Restart masakari-api container
|
|
|
|
- name: Copying over libvirt SASL configuration
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.service }}"
|
|
service: "{{ masakari_services[service_name] }}"
|
|
template:
|
|
src: "{{ item.src }}"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/{{ item.dest }}"
|
|
mode: "0660"
|
|
when:
|
|
- libvirt_enable_sasl | bool
|
|
- service | service_enabled_and_mapped_to_host
|
|
with_items:
|
|
- { src: "auth.conf.j2", dest: "auth.conf", service: "masakari-instancemonitor" }
|
|
notify:
|
|
- Restart {{ service_name }} container
|