From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 2 Feb 2017 11:48:44 +0000 (-0600)
Subject: modified to give proper naming convention for floating ip network.
X-Git-Tag: danube.1.0~66
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47386f12fa5d0785f338906514f5a595e2634a10;p=joid.git

modified to give proper naming convention for floating ip network.

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

diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 0f39386b..da98d022 100644
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -17,8 +17,8 @@ opnfv:
   interface-enable: {{ lab.racks[0].ifnamelist }}
   os-domain-name: {{ lab.racks[0].osdomainname }}
 {% if opnfv.spaces_dict.public is defined %}
-{% set netpublic_prefix = opnfv.spaces_dict.mgmt.cidr[:-4] %}
-  publicNetwork: {{ opnfv.spaces_dict.mgmt.cidr }}
+{% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %}
+  publicNetwork: {{ opnfv.spaces_dict.public.cidr }}
 {% endif %}
   spaces:
 {% for net in opnfv.spaces %}
@@ -38,7 +38,7 @@ opnfv:
 {% endif %}
   units: {{ lab.racks[0].nodes|count }}
   vip:
-{% if opnfv.spaces_dict.mgmt is defined %}
+{% if opnfv.spaces_dict.public is defined %}
 {% if opnfv.spaces_dict.data is defined %}
     ceilometer: {{ net_prefix }}24 {{ netdata_prefix }}24 {{ netpublic_prefix }}24
     cinder: {{ net_prefix }}29 {{ netdata_prefix }}29 {{ netpublic_prefix }}29
diff --git a/labconfig/huawei/pod12/labconfig.yaml b/labconfig/huawei/pod12/labconfig.yaml
index 1915a3e2..1d3da945 100644
--- a/labconfig/huawei/pod12/labconfig.yaml
+++ b/labconfig/huawei/pod12/labconfig.yaml
@@ -94,7 +94,7 @@ lab:
         user: root
         pass: Huawei12#$
     floating-ip-range: 10.6.15.7,10.6.15.250,10.6.15.1,10.6.15.0/24
-    ext-port: "br-enp4s0d1"
+    ext-port: "enp4s0d1"
     dns: 8.8.8.8
     public-api-ip:
     osdomainname:
@@ -107,7 +107,7 @@ opnfv:
   - type: nosdn
   storage:
   - type: ceph
-    disk: /dev/sdb
+    disk: /srv
   feature: odl_l2
   spaces:
   - type: admin
@@ -120,14 +120,14 @@ opnfv:
     cidr: 10.6.12.0/24
     gateway:
     vlan: 31
-  - type: public
+  - type: floating
     bridge: brPublic
     cidr: 10.6.15.0/24
     gateway:
     vlan: 31
   - type: external
     bridge: brExt
-    cidr:
+    cidr: 192.168.30.0/24
     gateway: 192.168.30.250
     ipaddress: 192.168.30.2
     vlan:
diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index 939add08..2d65c7ad 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -142,12 +142,12 @@ opnfv:
       cidr: 10.5.13.0/24
       gateway:
       vlan:
-    - type: mgmt
+    - type: public
       bridge: brMgmt
       cidr: 10.5.14.0/24
       gateway:
       vlan:
-    - type: public
+    - type: floating
       bridge: brPublic
       cidr: 10.5.15.0/24
       gateway: