summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml2
-rw-r--r--ci/config_tpl/juju2/deployconfig.yaml33
2 files changed, 10 insertions, 25 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
index 5f8d5adc..ecbef4f1 100644
--- a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
@@ -13,7 +13,7 @@
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.ha.mode == 'ha' %}
- vip: {{ opnfv.vip.rabbitmq }}
+ #vip: {{ opnfv.vip.rabbitmq }}
min-cluster-size: {{ unit_qty() }}
{% endif %}
to:
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 %}