From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 31 Jan 2017 23:08:13 +0000 (-0600)
Subject: modfied to make the ceph cluster and access node on same network.
X-Git-Tag: danube.1.0~72
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=joid.git;a=commitdiff_plain;h=e24fdfe5a51b08e1c063b2a16ef7186b54aa9cc9

modfied to make the ceph cluster and access node on same network.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 915e73d9..779d2c4c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -10,7 +10,7 @@
         public: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.storage is defined %}
-        cluster: cluster-stor
+        cluster: internal-api
 {% else %}
         cluster: internal-api
 {% endif %}
@@ -62,7 +62,7 @@
         public: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.storage is defined %}
-        cluster: cluster-stor
+        cluster: internal-api
 {% else %}
         cluster: internal-api
 {% endif %}
diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml
index 441b83a7..4090fa4d 100644
--- a/labconfig/intel/pod5/labconfig.yaml
+++ b/labconfig/intel/pod5/labconfig.yaml
@@ -137,10 +137,20 @@ opnfv:
       cidr: 10.5.12.0/24
       gateway:
       vlan:
+    - type: storage
+      bridge: brStor
+      cidr: 10.5.13.0/24
+      gateway:
+      vlan:
+    - type: mgmt
+      bridge: brMgmt
+      cidr: 10.5.14.0/24
+      gateway:
+      vlan:
     - type: public
       bridge: brPublic
       cidr: 10.5.15.0/24
-      gateway: 10.5.15.254
+      gateway:
       vlan:
     - type: external
       bridge: brExt