Support multiple physnet mapping

JIRA: COMPASS-559

1. support multiple mapping in provider_net_mappings
of network.yml and create corresponding ovs bridges
2. support seperate config in sys_intf_mappings
of network.yml
3. remove linux bridges in compute nodes for ovs
port binding convenience
4. support openstack vlan tenant network
5. modify odl and odl_sfc roles to use configurable
provider mapping
6. remove some hard coding

Change-Id: Ib57484ce60d029f89c647fd5baf2c7af37c85d0b
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

4 files changed, 0 insertions, 154 deletions

diff --git a/deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml b/deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml
deleted file mode 100644
index 346ef2fd..00000000
--- a/deploy/adapters/ansible/roles/config-osa/files/fetch-files.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# #############################################################################
-# Copyright (c) 2017 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
-# #############################################################################
----
-- name: Fetch openrc
-  hosts: utility_all[0]
-  max_fail_percentage: 20
-  user: root
-  tasks:
-    - fetch:
-        src: /root/openrc
-        dest: /opt/openrc
-        flat: "yes"
-
-- name: Fetch haproxy.cert
-  hosts: haproxy_hosts[0]
-  max_fail_percentage: 20
-  user: root
-  tasks:
-    - fetch:
-        src: /etc/ssl/certs/haproxy.cert
-        dest: /opt/os_cacert
-        flat: "yes"
diff --git a/deploy/adapters/ansible/roles/config-osa/files/os-flavor/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/files/os-flavor/tasks/main.yml
deleted file mode 100644
index 03b57120..00000000
--- a/deploy/adapters/ansible/roles/config-osa/files/os-flavor/tasks/main.yml
+++ /dev/null
@@ -1,17 +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
-##############################################################################
----
-
-- name: create openstack flavors
-  shell: |
-    . /root/openrc;
-    openstack flavor create {{ item.name }} \
-    --id {{ item.id }} --ram {{ item.ram }} \
-    --disk {{ item.disk }} --vcpus {{ item.vcpus }} || true
-  with_items: "{{ flavors }}"
diff --git a/deploy/adapters/ansible/roles/config-osa/files/os-flavor/vars/main.yml b/deploy/adapters/ansible/roles/config-osa/files/os-flavor/vars/main.yml
deleted file mode 100644
index d9c36d42..00000000
--- a/deploy/adapters/ansible/roles/config-osa/files/os-flavor/vars/main.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
----
-flavors:
-  - id: 0
-    name: m1.nano
-    vcpus: 1
-    ram: 64
-    disk: 1
-
-  - id: 1
-    name: m1.tiny
-    vcpus: 1
-    ram: 512
-    disk: 1
-
-  - id: 2
-    name: m1.small
-    vcpus: 1
-    ram: 2048
-    disk: 20
-
-  - id: 3
-    name: m1.medium
-    vcpus: 2
-    ram: 4096
-    disk: 40
-
-  - id: 4
-    name: m1.large
-    vcpus: 4
-    ram: 8192
-    disk: 80
-
-  - id: 5
-    name: m1.xlarge
-    vcpus: 8
-    ram: 16384
-    disk: 160
diff --git a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml b/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml
deleted file mode 100644
index ed631036..00000000
--- a/deploy/adapters/ansible/roles/config-osa/files/setup-ovs.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# #############################################################################
-# Copyright (c) 2017 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
-# #############################################################################
----
-- name: Installation and setup of Neutron
-  hosts: neutron_openvswitch_agent
-  gather_facts: "{{ gather_facts | default(True) }}"
-  max_fail_percentage: 20
-  user: root
-  tasks:
-    - name: stop neutron-openvswitch-agent
-      service:
-        name: neutron-openvswitch-agent
-        state: stopped
-
-    # yamllint disable rule:line-length
-    - name: change the openvswitch_agent.ini
-      lineinfile:
-        dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
-        insertafter: '^bridge_mappings'
-        line: "local_ip = {{ hostvars[inventory_hostname]['container_networks']['tunnel_address']['address'] }}"
-      when:
-        - inventory_hostname not in groups['nova_compute']
-
-    - name: change the openvswitch_agent.ini
-      lineinfile:
-        dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini
-        state: absent
-        regexp: '^bridge_mappings'
-      notify:
-        - Restart neutron-openvswitch-agent
-      when:
-        - inventory_hostname in groups['nova_compute']
-    # yamllint enable rule:line-length
-
-    - name: Setup br-provider
-      openvswitch_bridge:
-        bridge: br-provider
-        state: present
-      notify:
-        - Restart neutron-openvswitch-agent
-      when:
-        - inventory_hostname not in groups['nova_compute']
-
-    - name: Add port to br-provider
-      openvswitch_port:
-        bridge: br-provider
-        port: "eth12"
-        state: present
-      notify:
-        - Restart neutron-openvswitch-agent
-      when:
-        - inventory_hostname not in groups['nova_compute']
-
-  handlers:
-    - name: Restart neutron-openvswitch-agent
-      service:
-        name: neutron-openvswitch-agent
-        state: restarted