From 84a82d5b083ee7e3d490365265df3697c8f757b4 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 27 Jul 2017 11:33:05 -0500 Subject: modified the bundle for HA. Change-Id: I0ecd9b73ed0e3c9e3d639c53189d366a6c9f42d2 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/haclusters.yaml | 4 ++++ ci/config_tpl/juju2/bundle_tpl/harelations.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl') diff --git a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml index 1f1afb5a..3b5f1844 100644 --- a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml @@ -15,6 +15,7 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% if os.network.controller != 'ocl' %} # hacluster-heat: # charm: "./{{ ubuntu.release }}/hacluster" # options: @@ -22,6 +23,7 @@ # cluster_count: 3 {% if os.network.ipv6 %} # prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% endif %} hacluster-horizon: charm: "./{{ ubuntu.release }}/hacluster" @@ -55,6 +57,7 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% if os.network.controller != 'ocl' %} hacluster-ceilometer: charm: "./{{ ubuntu.release }}/hacluster" options: @@ -62,6 +65,7 @@ cluster_count: 3 {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% endif %} hacluster-mysql: charm: "./{{ ubuntu.release }}/hacluster" diff --git a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml index d4c4c064..212516c5 100644 --- a/ci/config_tpl/juju2/bundle_tpl/harelations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/harelations.yaml @@ -1,13 +1,15 @@ {% if os.ha.mode == 'ha' %} +{% if os.network.controller != 'ocl' %} +# - [ 'heat:ha', 'hacluster-heat:ha' ] + - [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ] +{% endif %} - [ 'mysql:ha', 'hacluster-mysql:ha' ] - [ 'cinder:ha', 'hacluster-cinder:ha' ] -# - [ 'heat:ha', 'hacluster-heat:ha' ] - [ 'glance:ha', 'hacluster-glance:ha' ] - [ 'keystone:ha', 'hacluster-keystone:ha' ] - [ 'neutron-api:ha', 'hacluster-neutron:ha' ] - [ 'nova-cloud-controller:ha', 'hacluster-nova:ha' ] - [ 'openstack-dashboard:ha', 'hacluster-horizon:ha' ] - - [ 'ceilometer:ha', 'hacluster-ceilometer:ha' ] {% if os.beta.hacluster_ceph_radosgw %} - [ 'ceph-radosgw:ha', 'hacluster-ceph-radosgw:ha' ] {% endif %} -- cgit 1.2.3-korg