From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan Date: Mon, 19 Dec 2016 11:06:36 +0800 Subject: master only support newton JIRA: COMPASS-513 Remove other roles and ppa, master only support newton. Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00 Signed-off-by: liyuenan --- .../roles/open-contrail/tasks/uninstall-openvswitch.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks') diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml index 0714d2e9..836cb78b 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/uninstall-openvswitch.yml @@ -4,17 +4,17 @@ - name: remove ovs and ovs-plugin daeman shell: > - sed -i '/neutron-plugin-openvswitch-agent/d' /opt/service ; + sed -i '/neutron-openvswitch-agent/d' /opt/service ; sed -i '/openvswitch-switch/d' /opt/service ; - name: stop ovs and ovs-plugin - shell: service openvswitch-switch stop; service neutron-plugin-openvswitch-agent stop; + shell: service openvswitch-switch stop; service neutron-openvswitch-agent stop; - name: remove ovs and ovs-plugin files shell: > - update-rc.d -f neutron-plugin-openvswitch-agent remove; - mv /etc/init.d/neutron-plugin-openvswitch-agent /home/neutron-plugin-openvswitch-agent; - mv /etc/init/neutron-plugin-openvswitch-agent.conf /home/neutron-plugin-openvswitch-agent.conf; + update-rc.d -f neutron-openvswitch-agent remove; + mv /etc/init.d/neutron-openvswitch-agent /home/neutron-openvswitch-agent; + mv /etc/init/neutron-openvswitch-agent.conf /home/neutron-openvswitch-agent.conf; update-rc.d -f openvswitch-switch remove ; mv /etc/init.d/openvswitch-switch /home/openvswitch-switch ; mv /etc/init/openvswitch-switch.conf /home/openvswitch-switch.conf ; -- cgit 1.2.3-korg