summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-02-02 05:48:44 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-02-02 05:48:44 -0600
commit47386f12fa5d0785f338906514f5a595e2634a10 (patch)
treed89c4abb7658974f5c0bafbf3a8719e2f11be3eb /ci/config_tpl/juju2
parentf62c2541dc5a6873434a4de4794e3c5f381e9c8c (diff)
modified to give proper naming convention for floating ip network.
Change-Id: I92d78e4a1dd232f699aa69b894335abf481bb9bd Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2')
-rw-r--r--ci/config_tpl/juju2/deployconfig.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml
index 0f39386b..da98d022 100644
--- 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,7 +38,7 @@ 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 {{ netdata_prefix }}24 {{ netpublic_prefix }}24
cinder: {{ net_prefix }}29 {{ netdata_prefix }}29 {{ netpublic_prefix }}29