From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 25 Aug 2017 18:47:29 +0000 (+0000)
Subject: Merge "Create new consolidated documentation for JOID"
X-Git-Tag: opnfv-5.0.RC1~28
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9dad7dbcc921d36f2209f01a38f5bfc1ec85f12f;hp=8d638a2bf2afed419767526edac2049f850801f7;p=joid.git

Merge "Create new consolidated documentation for JOID"
---

diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 8e7d3a05..9accba06 100644
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -1,6 +1,10 @@
 opnfv-{{ lab.location }}{{ lab.racks[0].rack }}-maas:
 opnfv:
+{% if opnfv.spaces_dict.osapi is defined %}
+{% set net_prefix = opnfv.spaces_dict.osapi.cidr[:-4] %}
+{% else %}
 {% set net_prefix = opnfv.spaces_dict.admin.cidr[:-4] %}
+{% endif %}
   admNetgway: {{ opnfv.spaces_dict.admin.gateway }}
   admNetwork: {{ net_prefix }}2
   admin_password: openstack