Merge "Create new consolidated documentation for JOID"
authorNarinder Gupta <narinder.gupta@canonical.com>
Fri, 25 Aug 2017 18:47:29 +0000 (18:47 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 25 Aug 2017 18:47:29 +0000 (18:47 +0000)
ci/config_tpl/juju2/deployconfig.yaml

index 8e7d3a0..9accba0 100644 (file)
@@ -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