From 0c929d196f53fe807214a392f06241cd3a6bc56c Mon Sep 17 00:00:00 2001 From: chenshuai Date: Thu, 11 Aug 2016 02:37:39 -0400 Subject: disable neutron-l3-agent for odl-l3 JIRA: COMPASS-471 Change-Id: I80d0ad6d95bb81d7a2592dd2c3a2051ac362494f Signed-off-by: chenshuai --- .../ansible/roles/odl_cluster/tasks/odl_controller.yml | 13 +++++++++++++ .../ansible/roles/odl_cluster_neutron/tasks/main.yml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'deploy/adapters/ansible/roles') diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml index 5c9b203e..51093236 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml @@ -187,6 +187,19 @@ service: name=keepalived state=stopped when: ansible_os_family == "Debian" +################ l3 agent remove ################### +- name: turn off neutron-l3-agent on control node + service: name=neutron-l3-agent state=stopped + when: odl_l3_agent == "Enable" + +- name: remove neutron-l3-agent daemon + shell: > + sed -i 'neutron-l3-agent/d' /opt/service ; + mv /etc/init.d/neutron-l3-agent /home/ ; + mv /etc/init/neutron-l3-agent.conf /home/ ; + when: odl_l3_agent == "Enable" +#################################################### + - name: chown opendaylight directory and files shell: > chown -R odl:odl "{{ odl_home }}"; diff --git a/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml index 751a02d7..3024dcf1 100755 --- a/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml +++ b/deploy/adapters/ansible/roles/odl_cluster_neutron/tasks/main.yml @@ -11,7 +11,7 @@ - name: restart neutron-l3-agent server service: name=neutron-l3-agent state=restarted - when: inventory_hostname in groups['odl'] + when: inventory_hostname in groups['odl'] and odl_l3_agent == "Disable" - name: restart neutron-dhcp-agent server service: name=neutron-dhcp-agent state=restarted -- cgit 1.2.3-korg