diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-07-27 11:33:05 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-07-27 11:33:05 -0500 |
| commit | 84a82d5b083ee7e3d490365265df3697c8f757b4 (patch) | |
| tree | bc6a97e060169f7efe9b35c8c50b03836983e45f /ci | |
| parent | 4e994076effb8d376b753bb435f04e290bbfe12c (diff) | |
modified the bundle for HA.
Change-Id: I0ecd9b73ed0e3c9e3d639c53189d366a6c9f42d2
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/haclusters.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/harelations.yaml | 6 |
2 files changed, 8 insertions, 2 deletions
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: @@ -23,6 +24,7 @@ {% if os.network.ipv6 %} # prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% endif %} hacluster-horizon: charm: "./{{ ubuntu.release }}/hacluster" options: @@ -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: @@ -63,6 +66,7 @@ {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} +{% endif %} hacluster-mysql: charm: "./{{ ubuntu.release }}/hacluster" options: 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 %} |