From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 2 Feb 2017 06:09:51 +0000 (-0600)
Subject: few reversal changes based on test result.
X-Git-Tag: danube.1.0~67
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f62c2541dc5a6873434a4de4794e3c5f381e9c8c;p=joid.git

few reversal changes based on test result.

Change-Id: I4c29ba756b66fcb777f14a632f2ec6bdcb5aea99
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 ac4c6a77..0f39386b 100644
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -39,15 +39,27 @@ opnfv:
   units: {{ lab.racks[0].nodes|count }}
   vip:
 {% if opnfv.spaces_dict.mgmt is defined %}
-    ceilometer: {{ netpublic_prefix }}24
-    cinder: {{ netpublic_prefix }}29
-    dashboard: {{ netpublic_prefix }}21
-    glance: {{ netpublic_prefix }}22
-    heat: {{ netpublic_prefix }}28
-    keystone: {{ netpublic_prefix }}23
+{% 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
+    dashboard: {{ net_prefix }}21 {{ netdata_prefix }}21 {{ netpublic_prefix }}21
+    glance: {{ net_prefix }}22 {{ netdata_prefix }}22 {{ netpublic_prefix }}22
+    heat: {{ net_prefix }}28 {{ netdata_prefix }}28 {{ netpublic_prefix }}28
+    keystone: {{ net_prefix }}23 {{ netdata_prefix }}23 {{ netpublic_prefix }}23
+    mysql: {{ net_prefix }}25
+    neutron: {{ net_prefix }}27 {{ netdata_prefix }}27 {{ netpublic_prefix }}27
+    nova: {{ net_prefix }}26 {{ netdata_prefix }}27 {{ netpublic_prefix }}26
+{% else %}
+    ceilometer: {{ net_prefix }}24 {{ netpublic_prefix }}24
+    cinder: {{ net_prefix }}29 {{ netpublic_prefix }}29
+    dashboard: {{ net_prefix }}21 {{ netpublic_prefix }}21
+    glance: {{ net_prefix }}22 {{ netpublic_prefix }}22
+    heat: {{ net_prefix }}28 {{ netpublic_prefix }}28
+    keystone: {{ net_prefix }}23 {{ netpublic_prefix }}23
     mysql: {{ net_prefix }}25
-    neutron: {{ netpublic_prefix }}27
-    nova: {{ netpublic_prefix }}26
+    neutron: {{ net_prefix }}27 {{ netpublic_prefix }}27
+    nova: {{ net_prefix }}26 {{ netpublic_prefix }}26
+{% endif %}
 {% else %}
     ceilometer: {{ net_prefix }}24
     cinder: {{ net_prefix }}29