From 63ff433d707cf0c1261ddc1a93636ccf864a610a Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 1 Feb 2017 16:56:45 -0600 Subject: modified the vips as per charm team. Change-Id: Id3a9d97eedc97515924018e81976e69c765d5432 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/deployconfig.yaml | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'ci/config_tpl/juju2/deployconfig.yaml') diff --git a/ci/config_tpl/juju2/deployconfig.yaml b/ci/config_tpl/juju2/deployconfig.yaml index a0e52623..ac4c6a77 100644 --- a/ci/config_tpl/juju2/deployconfig.yaml +++ b/ci/config_tpl/juju2/deployconfig.yaml @@ -39,29 +39,15 @@ opnfv: units: {{ lab.racks[0].nodes|count }} vip: {% if opnfv.spaces_dict.mgmt 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 -{% else %} - ceilometer: {{ net_prefix }}24 {{ netpublic_prefix }}24 - cinder: {{ net_prefix }}29 {{ netpublic_prefix }}29 - dashboard: {{ net_prefix }}21 {{ netpublic_prefix }}21 - 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 - neutron: {{ net_prefix }}27 {{ netpublic_prefix }}27 - nova: {{ net_prefix }}26 {{ netpublic_prefix }}26 - rabbitmq: {{ net_prefix }}20 {{ netpublic_prefix }}20 -{% endif %} + ceilometer: {{ netpublic_prefix }}24 + cinder: {{ netpublic_prefix }}29 + dashboard: {{ netpublic_prefix }}21 + glance: {{ netpublic_prefix }}22 + heat: {{ netpublic_prefix }}28 + keystone: {{ netpublic_prefix }}23 + mysql: {{ net_prefix }}25 + neutron: {{ netpublic_prefix }}27 + nova: {{ netpublic_prefix }}26 {% else %} ceilometer: {{ net_prefix }}24 cinder: {{ net_prefix }}29 @@ -72,5 +58,4 @@ opnfv: mysql: {{ net_prefix }}25 neutron: {{ net_prefix }}27 nova: {{ net_prefix }}26 - rabbitmq: {{ net_prefix }}20 {% endif %} -- cgit 1.2.3-korg