From 5fe11a8fcb302dfd3d52819136a8644921ee1ddc Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Tue, 21 Mar 2017 11:00:11 +0100 Subject: [PATCH] Fix neutron agents restarted on ml2 config change The following Neutron agents: - neutron-metadata - neutron-dhcp-agent - neutron-l3-agent - neutron-lbaasv2-agent - neutron-vpn-agent doesn't require ml2_conf.ini file. ml2_conf.ini file is used to managed L2 network configuration. This config doesn't have to be in DHCP, L3, metadata agents... We should remove it to avoid restarting these agents in case of ml2_conf.ini file modification. Only neutron-server, neutron-openvswitch-agent, neutron-linuxbridge-agent must be restarted. Closes-Bug: #1677163 Change-Id: I0876b8a3845d1c2bccd996426a65df1a3a6f7085 --- ansible/roles/neutron/handlers/main.yml | 10 ---------- ansible/roles/neutron/tasks/config.yml | 5 ----- ansible/roles/neutron/templates/dhcp_agent.ini.j2 | 4 ++++ ansible/roles/neutron/templates/l3_agent.ini.j2 | 4 ++++ .../roles/neutron/templates/neutron-dhcp-agent.json.j2 | 8 +------- .../roles/neutron/templates/neutron-l3-agent.json.j2 | 8 +------- .../neutron/templates/neutron-lbaas-agent.json.j2 | 8 +------- .../neutron/templates/neutron-metadata-agent.json.j2 | 6 ------ .../neutron/templates/neutron-vpnaas-agent.json.j2 | 8 +------- 9 files changed, 12 insertions(+), 49 deletions(-) diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml index 197964db28..fddaaccbcc 100644 --- a/ansible/roles/neutron/handlers/main.yml +++ b/ansible/roles/neutron/handlers/main.yml @@ -162,7 +162,6 @@ service: "{{ neutron_services[service_name] }}" config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" - neutron_ml2_conf: "{{ neutron_ml2_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_dhcp_agent_container: "{{ check_neutron_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" kolla_docker: @@ -178,7 +177,6 @@ - service.host_in_groups | bool - config_json | changed or neutron_conf | changed - or neutron_ml2_conf | changed or dhcp_agent_ini | changed or dnsmasq_conf | changed or policy_json | changed @@ -190,7 +188,6 @@ service: "{{ neutron_services[service_name] }}" config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" - neutron_ml2_conf: "{{ neutron_ml2_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_l3_agent_ini: "{{ neutron_l3_agent_inis.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_fwaas_driver_ini: "{{ neutron_fwaas_driver_inis.results|selectattr('item.key', 'equalto', service_name)|first }}" @@ -209,7 +206,6 @@ - service.host_in_groups | bool - config_json | changed or neutron_conf | changed - or neutron_ml2_conf | changed or neutron_l3_agent_ini | changed or neutron_fwaas_driver_ini | changed or policy_json | changed @@ -222,7 +218,6 @@ config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_lbaas_conf: "{{ neutron_lbaas_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" - neutron_ml2_conf: "{{ neutron_ml2_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_lbaas_agent_container: "{{ check_neutron_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" kolla_docker: @@ -238,7 +233,6 @@ - service.host_in_groups | bool - config_json | changed or neutron_conf | changed - or neutron_ml2_conf | changed or neutron_lbaas_agent_ini | changed or policy_json | changed or neutron_lbaas_agent_container | changed @@ -249,7 +243,6 @@ service: "{{ neutron_services[service_name] }}" config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" - neutron_ml2_conf: "{{ neutron_ml2_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_metadata_agent_container: "{{ check_neutron_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" kolla_docker: @@ -265,7 +258,6 @@ - service.host_in_groups | bool - config_json | changed or neutron_conf | changed - or neutron_ml2_conf | changed or neutron_metadata_agent_ini | changed or policy_json | changed or neutron_metadata_agent_container | changed @@ -276,7 +268,6 @@ service: "{{ neutron_services[service_name] }}" config_json: "{{ neutron_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_conf: "{{ neutron_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" - neutron_ml2_conf: "{{ neutron_ml2_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_l3_agent_ini: "{{ neutron_l3_agent_inis.results|selectattr('item.key', 'equalto', service_name)|first }}" neutron_fwaas_driver_ini: "{{ neutron_fwaas_driver_inis.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_json: "{{ policy_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" @@ -294,7 +285,6 @@ - service.host_in_groups | bool - config_json | changed or neutron_conf | changed - or neutron_ml2_conf | changed or neutron_l3_agent_ini | changed or neutron_fwaas_driver_ini | changed or neutron_vpnaas_agent_ini | changed diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 49c1ddca13..bd55d960e4 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -109,14 +109,9 @@ vars: service_name: "{{ item.key }}" services_need_ml2_conf_ini: - - "neutron-dhcp-agent" - - "neutron-l3-agent" - "neutron-linuxbridge-agent" - - "neutron-lbaas-agent" - - "neutron-metadata-agent" - "neutron-openvswitch-agent" - "neutron-server" - - "neutron-vpnaas-agent" merge_configs: sources: - "{{ role_path }}/templates/ml2_conf.ini.j2" diff --git a/ansible/roles/neutron/templates/dhcp_agent.ini.j2 b/ansible/roles/neutron/templates/dhcp_agent.ini.j2 index 0b2667b33e..c6ba97f65b 100644 --- a/ansible/roles/neutron/templates/dhcp_agent.ini.j2 +++ b/ansible/roles/neutron/templates/dhcp_agent.ini.j2 @@ -4,3 +4,7 @@ dnsmasq_config_file = /etc/neutron/dnsmasq.conf enable_isolated_metadata = true force_metadata = true dnsmasq_dns_servers = 8.8.8.8,8.8.4.4 + +[ovs] +ovsdb_interface = native +ovsdb_connection = tcp:{{ api_interface_address }}:6640 diff --git a/ansible/roles/neutron/templates/l3_agent.ini.j2 b/ansible/roles/neutron/templates/l3_agent.ini.j2 index b69d304644..1c89d75150 100644 --- a/ansible/roles/neutron/templates/l3_agent.ini.j2 +++ b/ansible/roles/neutron/templates/l3_agent.ini.j2 @@ -17,3 +17,7 @@ enabled = True [agent] extensions = fwaas {% endif %} + +[ovs] +ovsdb_interface = native +ovsdb_connection = tcp:{{ api_interface_address }}:6640 diff --git a/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2 b/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2 index 5244a5b7e9..a727bc7f14 100644 --- a/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2 +++ b/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2 @@ -1,5 +1,5 @@ { - "command": "neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/dhcp_agent.ini", + "command": "neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini", "config_files": [ { "source": "{{ container_config_directory }}/neutron.conf", @@ -7,12 +7,6 @@ "owner": "neutron", "perm": "0600" }, - { - "source": "{{ container_config_directory }}/ml2_conf.ini", - "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini", - "owner": "neutron", - "perm": "0600" - }, { "source": "{{ container_config_directory }}/dhcp_agent.ini", "dest": "/etc/neutron/dhcp_agent.ini", diff --git a/ansible/roles/neutron/templates/neutron-l3-agent.json.j2 b/ansible/roles/neutron/templates/neutron-l3-agent.json.j2 index 03fcadb12e..dc2ce84ece 100644 --- a/ansible/roles/neutron/templates/neutron-l3-agent.json.j2 +++ b/ansible/roles/neutron/templates/neutron-l3-agent.json.j2 @@ -1,5 +1,5 @@ { - "command": "neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini", + "command": "neutron-l3-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini", "config_files": [ { "source": "{{ container_config_directory }}/neutron.conf", @@ -7,12 +7,6 @@ "owner": "neutron", "perm": "0600" }, - { - "source": "{{ container_config_directory }}/ml2_conf.ini", - "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini", - "owner": "neutron", - "perm": "0600" - }, { "source": "{{ container_config_directory }}/fwaas_driver.ini", "dest": "/etc/neutron/fwaas_driver.ini", diff --git a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 index 9b966898ad..7f401efa9b 100644 --- a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 +++ b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 @@ -1,5 +1,5 @@ { - "command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/lbaas_agent.ini --config-file /etc/neutron/neutron_lbaas.conf", + "command": "neutron-lbaasv2-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/lbaas_agent.ini --config-file /etc/neutron/neutron_lbaas.conf", "config_files": [ { "source": "{{ container_config_directory }}/neutron.conf", @@ -13,12 +13,6 @@ "owner": "neutron", "perm": "0600" }, - { - "source": "{{ container_config_directory }}/ml2_conf.ini", - "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini", - "owner": "neutron", - "perm": "0600" - }, { "source": "{{ container_config_directory }}/neutron_lbaas.conf", "dest": "/etc/neutron/neutron_lbaas.conf", diff --git a/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 b/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 index f4b48ac763..531bf6ed0c 100644 --- a/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 +++ b/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 @@ -7,12 +7,6 @@ "owner": "neutron", "perm": "0600" }, - { - "source": "{{ container_config_directory }}/ml2_conf.ini", - "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini", - "owner": "neutron", - "perm": "0600" - }, { "source": "{{ container_config_directory }}/metadata_agent.ini", "dest": "/etc/neutron/metadata_agent.ini", diff --git a/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2 b/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2 index 265c935a62..95e776f353 100644 --- a/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2 +++ b/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2 @@ -1,5 +1,5 @@ { - "command": "neutron-vpn-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/vpnaas_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini", + "command": "neutron-vpn-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/vpnaas_agent.ini", "config_files": [ { "source": "{{ container_config_directory }}/neutron.conf", @@ -7,12 +7,6 @@ "owner": "neutron", "perm": "0600" }, - { - "source": "{{ container_config_directory }}/ml2_conf.ini", - "dest": "/etc/neutron/plugins/ml2/ml2_conf.ini", - "owner": "neutron", - "perm": "0600" - }, { "source": "{{ container_config_directory }}/fwaas_driver.ini", "dest": "/etc/neutron/fwaas_driver.ini",