modified to use correct VIP address for internet api.

[joid.git] / ci / config_tpl / juju2 / deployconfig.yaml

diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index bc2e127..9accba0 100644 (file)
--- 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
@@ -14,10 +18,6 @@ opnfv:
 {% if opnfv.spaces_dict.data is defined %}
 {% set netdata_prefix = opnfv.spaces_dict.data.cidr[:-4] %}
   dataNetwork: {{ opnfv.spaces_dict.data.cidr }}
-{% endif %}
-{% if lab.racks[0].osdomainname is defined %}
-  domain: {{ lab.racks[0].osdomainname }}
-  os-domain-name: {{ lab.racks[0].osdomainname }}
 {% endif %}
   ext-port: {{ lab.racks[0]['ext-port'] }}
   ext_port: {{ lab.racks[0]['ext-port'] }}
@@ -46,7 +46,7 @@ opnfv:
   units: {{ lab.racks[0].nodes|count }}
   vip:
 {% if opnfv.spaces_dict.public is defined %}
-    ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24 {{ netpublic_prefix }}24
+    ceilometer: {{ netpublic_prefix }}24 {{ net_prefix }}24
     cinder: {{ netpublic_prefix }}29 {{ net_prefix }}29
     dashboard: {{ netpublic_prefix }}21 {{ net_prefix }}21
     glance: {{ netpublic_prefix }}22 {{ net_prefix }}22