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, 13 insertions, 13 deletions

diff --git a/deploy/compass_conf/package_metadata/openstack.conf b/deploy/compass_conf/package_metadata/openstack.conf
index 9f079f9e..6027cb1a 100755
--- a/deploy/compass_conf/package_metadata/openstack.conf
+++ b/deploy/compass_conf/package_metadata/openstack.conf
@@ -268,36 +268,36 @@ METADATA = {
         }
     },
 
-    'openo_net': {
+    'tenant_net_info': {
         '_self': {
-            'mapping_to': 'openo_net',
-            'is_required': False
+            'mapping_to': 'tenant_net_info',
+            'is_required': True
         },
 
-        'openo_ip': {
+        'type': {
             '_self': {
-            'mapping_to': 'openo_ip',
-            'is_required': False,
+            'mapping_to': 'type',
+            'is_required': True,
             'field': 'general',
+            'options': ['vxlan', 'vlan'],
             }
         },
-        'openo_docker_gw': {
+        'range': {
             '_self': {
-            'mapping_to': 'openo_docker_gw',
-            'is_required': False,
+            'mapping_to': 'range',
+            'is_required': True,
             'field': 'general',
             }
         },
-        'openo_docker_cidr': {
+        'provider_network': {
             '_self': {
-            'mapping_to': 'openo_docker_cidr',
-            'is_required': False,
+            'mapping_to': 'provider_network',
+            'is_required': True,
             'field': 'general',
             }
         }
     },
 
-
     'public_net_info': {
         '_self': {
             'mapping_to': 'public_net_info'