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>

1 files changed, 0 insertions, 87 deletions

diff --git a/plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-agents-2.yml b/plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-agents-2.yml
deleted file mode 100644
index f53a3ac8..00000000
--- a/plugins/odl_sfc/roles/odl_cluster_sfc/tasks/control-agents-2.yml
+++ /dev/null
@@ -1,87 +0,0 @@
----
-
-- name: set opendaylight as the manager
-  command: |
-    su -s /bin/sh -c "ovs-vsctl set-manager tcp:{{ internal_lb_vip_address }}:6640;"
-
-- name: check br-int
-  shell: |
-    ovs-vsctl list-br | grep br-int; while [ $? -ne 0 ]; do sleep 10; \
-        ovs-vsctl list-br | grep br-int; done
-
-# yamllint disable rule:line-length
-- name: set local ip in openvswitch
-  shell: |
-    ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \
-        other_config={'local_ip'=' {{ hostvars[inventory_hostname]['container_networks']['tunnel_address']['address'] }} '};
-  when: inventory_hostname not in groups['nova_compute']
-
-- name: set local ip in openvswitch
-  shell: |
-    ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \
-        other_config={'local_ip'=' {{ hostvars[inventory_hostname]['ansible_br_vxlan']['ipv4']['address'] }} '};
-  when: inventory_hostname in groups['nova_compute']
-# yamllint enable rule:line-length
-
-- name: Setup br-provider
-  openvswitch_bridge:
-    bridge: br-provider
-    state: present
-  when:
-    - inventory_hostname not in groups['nova_compute']
-    - odl_l3_agent == "Disable"
-
-- name: add ovs uplink
-  openvswitch_port:
-    bridge: br-provider
-    port: "eth12"
-    state: present
-  when:
-    - inventory_hostname not in groups['nova_compute']
-    - odl_l3_agent == "Disable"
-
-- name: set external nic in openvswitch
-  shell: |
-    ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \
-        other_config:provider_mappings=physnet:br-provider
-  when:
-    - odl_l3_agent == "Disable"
-    - inventory_hostname not in groups['nova_compute']
-
-- name: set external nic in openvswitch
-  shell: |
-    ovs-vsctl set Open_vSwitch $(ovs-vsctl show | head -n 1) \
-        other_config:provider_mappings=physnet:eth12
-  when:
-    - odl_l3_agent == "Enable"
-
-- name: Set host OVS configurations
-  command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig \
-            --datapath_type=system --bridge_mappings=physnet:br-provider
-  when:
-    - inventory_hostname not in groups['nova_compute']
-    - odl_l3_agent == "Disable"
-
-- name: Set host OVS configurations
-  command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig
-            --datapath_type=system --bridge_mappings=physnet:eth12
-  when:
-    - inventory_hostname not in groups['nova_compute']
-    - odl_l3_agent == "Enable"
-
-- name: Set host OVS configurations
-  command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig --datapath_type=system
-  when:
-    - inventory_hostname in groups['nova_compute']
-    - odl_l3_agent == "Disable"
-
-- name: Set host OVS configurations
-  command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig
-            --datapath_type=system --bridge_mappings=physnet:eth12
-  when:
-    - inventory_hostname in groups['nova_compute']
-    - odl_l3_agent == "Enable"