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>

2 files changed, 0 insertions, 142 deletions

diff --git a/deploy/adapters/ansible/openstack_osp9/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/openstack_osp9/roles/neutron-network/tasks/main.yml
deleted file mode 100755
index 31f7f17c..00000000
--- a/deploy/adapters/ansible/openstack_osp9/roles/neutron-network/tasks/main.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-- include_vars: "{{ ansible_os_family }}.yml"
-
-- name: activate ipv4 forwarding
-  sysctl: name=net.ipv4.ip_forward value=1
-          state=present reload=yes
-
-- name: deactivate ipv4 rp filter
-  sysctl: name=net.ipv4.conf.all.rp_filter value=0
-          state=present reload=yes
-
-- name: deactivate ipv4 default rp filter
-  sysctl: name=net.ipv4.conf.default.rp_filter
-          value=0 state=present reload=yes
-
-- name: assert kernel support for vxlan
-  command: modinfo -F version vxlan
-  when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
-
-- name: assert iproute2 suppport for vxlan
-  command: ip link add type vxlan help
-  register: iproute_out
-  failed_when: iproute_out.rc == 255
-  when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
-
-- name: disable auto start
-  copy:
-    content: "#!/bin/sh\nexit 101"
-    dest: "/usr/sbin/policy-rc.d"
-    mode: 0755
-  when: ansible_os_family == "Debian"
-
-- name: install neutron network related packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items: packages | union(packages_noarch)
-
-- name: enable auto start
-  file:
-    path=/usr/sbin/policy-rc.d
-    state=absent
-  when: ansible_os_family == "Debian"
-
-- name: generate neutron network service list
-  lineinfile: dest=/opt/service create=yes line='{{ item }}'
-  with_items: services | union(services_noarch)
-
-- name: fix openstack neutron plugin config file
-  shell: |
-    sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
-    systemctl daemon-reload
-  when: ansible_os_family == 'RedHat'
-
-- name: fix openstack neutron plugin config file ubuntu
-  shell: |
-    sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /etc/init/neutron-openvswitch-agent.conf
-    sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /etc/init.d/neutron-openvswitch-agent
-  when: ansible_os_family == "Debian"
-
-- name: config l3 agent
-  template: src=l3_agent.ini dest=/etc/neutron/l3_agent.ini
-            backup=yes
-
-- name: config dhcp agent
-  template: src=dhcp_agent.ini dest=/etc/neutron/dhcp_agent.ini
-            backup=yes
-
-- name: update dnsmasq-neutron.conf
-  template: src=templates/dnsmasq-neutron.conf
-            dest=/etc/neutron/dnsmasq-neutron.conf
-
-- name: config metadata agent
-  template: src=metadata_agent.ini
-            dest=/etc/neutron/metadata_agent.ini backup=yes
-
-- name: config ml2 plugin
-  template: src=templates/ml2_conf.ini
-            dest=/etc/neutron/plugins/ml2/ml2_conf.ini
-            backup=yes
-
-- name: ln plugin.ini
-  file: src=/etc/neutron/plugins/ml2/ml2_conf.ini dest=/etc/neutron/plugin.ini state=link
-
-- name: config neutron
-  template: src=templates/neutron.conf
-            dest=/etc/neutron/neutron.conf backup=yes
-
-- name: force mtu to 1450 for vxlan
-  lineinfile:
-    dest: /etc/neutron/dnsmasq-neutron.conf
-    regexp: '^dhcp-option-force'
-    line: 'dhcp-option-force=26,1450'
-  when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
-
-- include: firewall.yml
-  when: enable_fwaas == True
-
-- include: vpn.yml
-  when: enable_vpnaas == True
-
-- include: odl.yml
-  when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS }}"
-
-- name: restart neutron network relation service
-  service: name={{ item }} state=restarted enabled=yes
-  with_flattened:
-    - services_noarch
-    - services
-
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/openstack_osp9/roles/neutron-network/vars/Debian.yml b/deploy/adapters/ansible/openstack_osp9/roles/neutron-network/vars/Debian.yml
deleted file mode 100755
index c95d0265..00000000
--- a/deploy/adapters/ansible/openstack_osp9/roles/neutron-network/vars/Debian.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-packages:
-  - neutron-plugin-ml2
-  - openvswitch-datapath-dkms
-  - openvswitch-switch
-  - neutron-l3-agent
-  - neutron-dhcp-agent
-  - neutron-plugin-openvswitch-agent
-
-services:
-  - openvswitch-switch
-  - neutron-openvswitch-agent
-
-openvswitch_agent: neutron-plugin-openvswitch-agent
-
-xorp_packages:
-  - xorp