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>
494 lines
16 KiB
YAML
494 lines
16 KiB
YAML
---
|
|
- name: Ensuring config directories exist
|
|
become: true
|
|
file:
|
|
path: "{{ node_config_directory }}/{{ item.key }}"
|
|
state: "directory"
|
|
owner: "{{ config_owner_user }}"
|
|
group: "{{ config_owner_group }}"
|
|
mode: "0770"
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
|
|
- name: Check if extra ml2 plugins exists
|
|
find:
|
|
path: "{{ node_custom_config }}/neutron/plugins/"
|
|
delegate_to: localhost
|
|
run_once: True
|
|
changed_when: False
|
|
register: check_extra_ml2_plugins
|
|
|
|
- include_tasks: copy-certs.yml
|
|
when:
|
|
- kolla_copy_ca_into_containers | bool or neutron_enable_tls_backend | bool
|
|
|
|
- name: Creating TLS backend PEM File
|
|
vars:
|
|
service: "{{ neutron_services['neutron-tls-proxy'] }}"
|
|
assemble:
|
|
src: "{{ node_config_directory }}/neutron-tls-proxy/"
|
|
dest: "{{ node_config_directory }}/neutron-tls-proxy/neutron-cert-and-key.pem"
|
|
mode: "0660"
|
|
regexp: "^neutron-(cert|key)\\.pem$"
|
|
remote_src: true
|
|
become: true
|
|
when: service | service_enabled_and_mapped_to_host
|
|
|
|
- name: Check if policies shall be overwritten
|
|
stat:
|
|
path: "{{ item }}"
|
|
delegate_to: localhost
|
|
run_once: True
|
|
register: neutron_policy
|
|
with_first_found:
|
|
- files: "{{ supported_policy_format_list }}"
|
|
paths:
|
|
- "{{ node_custom_config }}/neutron/"
|
|
skip: true
|
|
|
|
- name: Set neutron policy file
|
|
set_fact:
|
|
neutron_policy_file: "{{ neutron_policy.results.0.stat.path | basename }}"
|
|
neutron_policy_file_path: "{{ neutron_policy.results.0.stat.path }}"
|
|
when:
|
|
- neutron_policy.results
|
|
|
|
- name: Copying over existing policy file
|
|
template:
|
|
src: "{{ neutron_policy_file_path }}"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/{{ neutron_policy_file }}"
|
|
mode: "0660"
|
|
become: true
|
|
when:
|
|
- neutron_policy_file is defined
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over config.json files for services
|
|
become: true
|
|
template:
|
|
src: "{{ item.key }}.json.j2"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
|
|
mode: "0660"
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over neutron.conf
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.key }}"
|
|
services_need_neutron_conf:
|
|
- "ironic-neutron-agent"
|
|
- "neutron-dhcp-agent"
|
|
- "neutron-l3-agent"
|
|
- "neutron-linuxbridge-agent"
|
|
- "neutron-metadata-agent"
|
|
- "neutron-ovn-metadata-agent"
|
|
- "neutron-metering-agent"
|
|
- "neutron-openvswitch-agent"
|
|
- "neutron-server"
|
|
- "neutron-bgp-dragent"
|
|
- "neutron-infoblox-ipam-agent"
|
|
- "neutron-sriov-agent"
|
|
- "neutron-mlnx-agent"
|
|
- "neutron-eswitchd"
|
|
- "neutron-ovn-agent"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/neutron.conf.j2"
|
|
- "{{ node_custom_config }}/global.conf"
|
|
- "{{ node_custom_config }}/neutron.conf"
|
|
- "{{ node_custom_config }}/neutron/{{ item.key }}.conf"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/neutron.conf"
|
|
mode: "0660"
|
|
when:
|
|
- item.key in services_need_neutron_conf
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over neutron_vpnaas.conf
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.key }}"
|
|
services_need_neutron_vpnaas_conf:
|
|
- "neutron-server"
|
|
- "neutron-l3-agent"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/neutron_vpnaas.conf.j2"
|
|
- "{{ node_custom_config }}/neutron/neutron_vpnaas.conf"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron_vpnaas.conf"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/neutron_vpnaas.conf"
|
|
mode: "0660"
|
|
when:
|
|
- item.key in services_need_neutron_vpnaas_conf
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over ssh key
|
|
become: true
|
|
vars:
|
|
service: "{{ neutron_services['neutron-server'] }}"
|
|
template:
|
|
src: "id_rsa"
|
|
dest: "{{ node_config_directory }}/neutron-server/id_rsa"
|
|
mode: 0600
|
|
when: service | service_enabled_and_mapped_to_host
|
|
|
|
- name: Copying over ml2_conf.ini
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.key }}"
|
|
services_need_ml2_conf_ini:
|
|
- "neutron-infoblox-ipam-agent"
|
|
- "neutron-server"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/ml2_conf.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/ml2_conf.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/ml2_conf.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/ml2_conf.ini"
|
|
mode: "0660"
|
|
when:
|
|
- item.key in services_need_ml2_conf_ini
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over linuxbridge_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-linuxbridge-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/linuxbridge_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/linuxbridge_agent.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/linuxbridge_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/linuxbridge_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over openvswitch_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-openvswitch-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/openvswitch_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/openvswitch_agent.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/openvswitch_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/openvswitch_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over sriov_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-sriov-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/sriov_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/sriov_agent.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/sriov_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/sriov_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over mlnx_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-mlnx-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/mlnx_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/mlnx_agent.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/mlnx_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/mlnx_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over eswitchd.conf
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-eswitchd"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/eswitchd.conf.j2"
|
|
- "{{ node_custom_config }}/neutron/eswitchd.conf"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/eswitchd.conf"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/eswitchd.conf"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over dhcp_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-dhcp-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/dhcp_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/dhcp_agent.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/dhcp_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/dhcp_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over dnsmasq.conf
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-dhcp-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
template:
|
|
src: "{{ item }}"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/dnsmasq.conf"
|
|
mode: "0660"
|
|
with_first_found:
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/dnsmasq.conf"
|
|
- "{{ node_custom_config }}/neutron/dnsmasq.conf"
|
|
- "dnsmasq.conf.j2"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over l3_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.key }}"
|
|
services_need_l3_agent_ini:
|
|
- "neutron-l3-agent"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/l3_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/l3_agent.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/l3_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/l3_agent.ini"
|
|
mode: "0660"
|
|
when:
|
|
- item.key in services_need_l3_agent_ini
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over fwaas_driver.ini
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.key }}"
|
|
services_need_fwaas_driver_ini:
|
|
- "neutron-server"
|
|
- "neutron-l3-agent"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/fwaas_driver.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/fwaas_driver.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/fwaas_driver.ini"
|
|
mode: "0660"
|
|
when:
|
|
- enable_neutron_fwaas | bool
|
|
- item.key in services_need_fwaas_driver_ini
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|
|
|
|
- name: Copying over metadata_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-metadata-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/metadata_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/metadata_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/metadata_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over neutron_ovn_metadata_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-ovn-metadata-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/neutron_ovn_metadata_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/neutron_ovn_metadata_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/neutron_ovn_metadata_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over metering_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-metering-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/metering_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/metering_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/metering_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over ironic_neutron_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "ironic-neutron-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/ironic_neutron_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/ironic_neutron_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/ironic_neutron_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over bgp_dragent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-bgp-dragent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/bgp_dragent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/bgp_dragent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/bgp_dragent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over ovn_agent.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-ovn-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/ovn_agent.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/ovn_agent.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/ovn_agent.ini"
|
|
mode: "0660"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over nsx.ini
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-server"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/nsx.ini.j2"
|
|
- "{{ node_custom_config }}/neutron/nsx.ini"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/nsx.ini"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/nsx.ini"
|
|
mode: "0660"
|
|
when:
|
|
- service | service_enabled_and_mapped_to_host
|
|
- neutron_plugin_agent in ['vmware_nsxv', 'vmware_nsxv3', 'vmware_nsxp', 'vmware_dvs']
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copy neutron-l3-agent-wrapper script
|
|
become: true
|
|
vars:
|
|
service_name: "neutron-l3-agent"
|
|
service: "{{ neutron_services[service_name] }}"
|
|
template:
|
|
src: neutron-l3-agent-wrapper.sh.j2
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/neutron-l3-agent-wrapper.sh"
|
|
mode: "0770"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- "Restart {{ service_name }} container"
|
|
|
|
- name: Copying over extra ml2 plugins
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.0 }}"
|
|
services_need_ml2_conf_ini:
|
|
- "neutron-linuxbridge-agent"
|
|
- "neutron-openvswitch-agent"
|
|
- "neutron-server"
|
|
template:
|
|
src: "{{ item.2.path }}"
|
|
dest: "{{ node_config_directory }}/{{ service_name }}/{{ item.2.path | basename }}"
|
|
mode: "0660"
|
|
when:
|
|
- item.2 is defined
|
|
- item.1.enabled | bool
|
|
- item.1.host_in_groups | bool
|
|
- service_name in services_need_ml2_conf_ini
|
|
with_nested:
|
|
- "{{ neutron_services | dictsort }}"
|
|
- "{{ check_extra_ml2_plugins.files }}"
|
|
notify:
|
|
- "Restart {{ item.0 }} container"
|
|
|
|
- name: Copying over neutron-tls-proxy.cfg
|
|
vars:
|
|
service: "{{ neutron_services['neutron-tls-proxy'] }}"
|
|
template:
|
|
src: "{{ item }}"
|
|
dest: "{{ node_config_directory }}/neutron-tls-proxy/neutron-tls-proxy.cfg"
|
|
mode: "0660"
|
|
become: true
|
|
with_first_found:
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron-tls-proxy.cfg"
|
|
- "{{ node_custom_config }}/neutron/neutron-tls-proxy.cfg"
|
|
- "neutron-tls-proxy.cfg.j2"
|
|
when: service | service_enabled_and_mapped_to_host
|
|
notify:
|
|
- Restart neutron-tls-proxy container
|
|
|
|
- name: Copying over neutron_taas.conf
|
|
become: true
|
|
vars:
|
|
service_name: "{{ item.key }}"
|
|
services_need_neutron_taas_conf:
|
|
- "neutron-server"
|
|
- "neutron-openvswitch-agent"
|
|
merge_configs:
|
|
sources:
|
|
- "{{ role_path }}/templates/neutron_taas.conf.j2"
|
|
- "{{ node_custom_config }}/neutron/neutron_taas.conf"
|
|
- "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron_taas.conf"
|
|
dest: "{{ node_config_directory }}/{{ item.key }}/neutron_taas.conf"
|
|
mode: "0660"
|
|
when:
|
|
- enable_neutron_taas | bool
|
|
- item.key in services_need_neutron_taas_conf
|
|
with_dict: "{{ neutron_services | select_services_enabled_and_mapped_to_host }}"
|
|
notify:
|
|
- "Restart {{ item.key }} container"
|