modified to give proper naming convention for floating ip network.

[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 a0e5262..da98d02 100644 (file)
--- a/ci/config_tpl/juju2/deployconfig.yaml
+++ b/ci/config_tpl/juju2/deployconfig.yaml
@@ -17,8 +17,8 @@ opnfv:
   interface-enable: {{ lab.racks[0].ifnamelist }}
   os-domain-name: {{ lab.racks[0].osdomainname }}
 {% if opnfv.spaces_dict.public is defined %}
-{% set netpublic_prefix = opnfv.spaces_dict.mgmt.cidr[:-4] %}
-  publicNetwork: {{ opnfv.spaces_dict.mgmt.cidr }}
+{% set netpublic_prefix = opnfv.spaces_dict.public.cidr[:-4] %}
+  publicNetwork: {{ opnfv.spaces_dict.public.cidr }}
 {% endif %}
   spaces:
 {% for net in opnfv.spaces %}
@@ -38,18 +38,17 @@ opnfv:
 {% endif %}
   units: {{ lab.racks[0].nodes|count }}
   vip:
-{% if opnfv.spaces_dict.mgmt is defined %}
+{% if opnfv.spaces_dict.public is defined %}
 {% if opnfv.spaces_dict.data is defined %}
-    ceilometer: {{ net_prefix }}24 {{ netpublic_prefix }}24 {{ netdata_prefix }}24
-    cinder: {{ net_prefix }}29 {{ netpublic_prefix }}29 {{ netdata_prefix }}29
-    dashboard: {{ net_prefix }}21 {{ netpublic_prefix }}21 {{ netdata_prefix }}21
-    glance: {{ net_prefix }}22 {{ netpublic_prefix }}22 {{ netdata_prefix }}22
-    heat: {{ net_prefix }}28 {{ netpublic_prefix }}28 {{ netdata_prefix }}28
-    keystone: {{ net_prefix }}23 {{ netpublic_prefix }}23 {{ netdata_prefix }}23
-    mysql: {{ net_prefix }}25 {{ netpublic_prefix }}25 {{ netdata_prefix }}25
-    neutron: {{ net_prefix }}27 {{ netpublic_prefix }}27 {{ netdata_prefix }}27
-    nova: {{ net_prefix }}26 {{ netpublic_prefix }}26 {{ netdata_prefix }}26
-    rabbitmq: {{ net_prefix }}20 {{ netpublic_prefix }}20 {{ netdata_prefix }}20
+    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
@@ -57,10 +56,9 @@ opnfv:
     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 {{ netpublic_prefix }}25
+    mysql: {{ net_prefix }}25
     neutron: {{ net_prefix }}27 {{ netpublic_prefix }}27
     nova: {{ net_prefix }}26 {{ netpublic_prefix }}26
-    rabbitmq: {{ net_prefix }}20 {{ netpublic_prefix }}20
 {% endif %}
 {% else %}
     ceilometer: {{ net_prefix }}24
@@ -72,5 +70,4 @@ opnfv:
     mysql: {{ net_prefix }}25
     neutron: {{ net_prefix }}27
     nova: {{ net_prefix }}26
-    rabbitmq: {{ net_prefix }}20
 {% endif %}