From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sat, 11 Feb 2017 01:50:56 +0000 (-0600)
Subject: few more corrections of deployment and enabling interface within
X-Git-Tag: danube.1.0~44
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a252191f5186f9ce77fadc3d158e1cbe4b183748;p=joid.git

few more corrections of deployment and enabling interface within
MAAS.

Change-Id: Ibd3175a5dce98c7be771ef44bbe6df579ce65d44
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 015130b7..be7ced2c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -25,9 +25,9 @@
     openvswitch-odl:
       charm: ./{{ ubuntu.release }}/openvswitch-odl
       options:
-+{% if opnfv.ext_port is defined  %}
-+        provider_mappings: "physnet1:{{ opnfv.ext_port }}"
-+{% endif %}
+{% if opnfv.ext_port is defined  %}
+        provider_mappings: "physnet1:{{ opnfv.ext_port }}"
+{% endif %}
 {% if opnfv.spaces_dict.data is defined %}
         os-data-network: {{ opnfv.spaces_dict.data.cidr }}
 {% endif %}
diff --git a/labconfig/default/labconfig.yaml b/labconfig/default/labconfig.yaml
index d6983007..2dead607 100644
--- a/labconfig/default/labconfig.yaml
+++ b/labconfig/default/labconfig.yaml
@@ -7,28 +7,28 @@ lab:
       architecture: x86_64
       roles: [network,control]
       nics:
-      - ifname: eth0
+      - ifname: ens3
         spaces: [admin]
-      - ifname: eth1
+      - ifname: ens4
         spaces: [floating]
     - name: rack-vir-m2
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth0
+      - ifname: ens3
         spaces: [admin]
-      - ifname: eth1
+      - ifname: ens4
         spaces: [floating]
     - name: rack-vir-m3
       architecture: x86_64
       roles: [compute,control,storage]
       nics:
-      - ifname: eth1
+      - ifname: ens3
         spaces: [admin]
-      - ifname: eth1
+      - ifname: ens4
         spaces: [floating]
     floating-ip-range: 192.168.122.31,192.168.122.49,192.168.122.1,192.168.122.0/24
-    ext-port: "eth1"
+    ext-port: "ens4"
     dns: 8.8.8.8
 opnfv:
   release: d