master only support newton

JIRA: COMPASS-513

Remove other roles and ppa, master only support newton.

Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>

1 files changed, 0 insertions, 46 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/open-contrail/tasks/uninstall-openvswitch.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/open-contrail/tasks/uninstall-openvswitch.yml
deleted file mode 100755
index 836cb78b..00000000
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/open-contrail/tasks/uninstall-openvswitch.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- name: del ovs bridge
-  shell: ovs-vsctl del-br br-int; ovs-vsctl del-br br-tun; ovs-vsctl del-br br-prv;
-
-- name: remove ovs and ovs-plugin daeman
-  shell: >
-    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-openvswitch-agent stop;
-
-- name: remove ovs and ovs-plugin files
-  shell: >
-    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 ;
-    update-rc.d -f neutron-ovs-cleanup remove ;
-    mv /etc/init.d/neutron-ovs-cleanup /home/neutron-ovs-cleanup ;
-    mv /etc/init/neutron-ovs-cleanup.conf /home/neutron-ovs-cleanup.conf ;
-
-- name: remove ovs kernel module
-  shell: rmmod vport_vxlan; rmmod openvswitch;
-  ignore_errors: True
-
-- name: copy recovery script
-  copy:  src={{ item }} dest=/opt/setup_networks
-  with_items:
-#    - recover_network_opencontrail.py
-    - setup_networks_opencontrail.py
-
-#- name: recover external script
-#  shell: python /opt/setup_networks/recover_network_opencontrail.py
-
-- name: modify net-init
-  shell: sed -i 's/setup_networks.py/setup_networks_opencontrail.py/g' /etc/init.d/net_init
-
-- name: resolve dual NIC problem
-  shell: >
-    echo "net.ipv4.conf.all.arp_ignore=1" >> /etc/sysctl.conf ;
-    /sbin/sysctl -p ;
-    echo 1 > /proc/sys/net/ipv4/conf/all/arp_ignore ;
-