diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-07-25 09:34:41 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-07-25 09:35:04 -0500 |
| commit | 491e67e469c18be60e005c1455ed61d071756d14 (patch) | |
| tree | 1d5367b995343e59cc1358a29e5d484a27bd9ee9 | |
| parent | eb637946cfb232a246ba64b6c10a30c58c361527 (diff) | |
remove heat in HA mode.
Change-Id: Ied1581d318b319be776e9a4551dfa94a98faeadc
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
| -rw-r--r-- | ci/bundle_tpl/haclusters.yaml | 10 | ||||
| -rw-r--r-- | ci/bundle_tpl/harelations.yaml | 2 | ||||
| -rw-r--r-- | ci/bundle_tpl/heat.yaml | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/ci/bundle_tpl/haclusters.yaml b/ci/bundle_tpl/haclusters.yaml index ef193654..fc42d38e 100644 --- a/ci/bundle_tpl/haclusters.yaml +++ b/ci/bundle_tpl/haclusters.yaml @@ -9,11 +9,11 @@ options: corosync_transport: unicast cluster_count: 3 - hacluster-heat: - charm: "local:{{ ubuntu.release }}/hacluster" - options: - corosync_transport: unicast - cluster_count: 3 +# hacluster-heat: +# charm: "local:{{ ubuntu.release }}/hacluster" +# options: +# corosync_transport: unicast +# cluster_count: 3 hacluster-horizon: charm: "local:{{ ubuntu.release }}/hacluster" options: diff --git a/ci/bundle_tpl/harelations.yaml b/ci/bundle_tpl/harelations.yaml index e7bac9a2..d4c4c064 100644 --- a/ci/bundle_tpl/harelations.yaml +++ b/ci/bundle_tpl/harelations.yaml @@ -1,7 +1,7 @@ {% if os.ha.mode == 'ha' %} - [ 'mysql:ha', 'hacluster-mysql:ha' ] - [ 'cinder:ha', 'hacluster-cinder:ha' ] - - [ 'heat:ha', 'hacluster-heat:ha' ] +# - [ 'heat:ha', 'hacluster-heat:ha' ] - [ 'glance:ha', 'hacluster-glance:ha' ] - [ 'keystone:ha', 'hacluster-keystone:ha' ] - [ 'neutron-api:ha', 'hacluster-neutron:ha' ] diff --git a/ci/bundle_tpl/heat.yaml b/ci/bundle_tpl/heat.yaml index 5f8be0a2..af448035 100644 --- a/ci/bundle_tpl/heat.yaml +++ b/ci/bundle_tpl/heat.yaml @@ -1,14 +1,12 @@ heat: charm: "local:{{ ubuntu.release }}/heat" - num_units: {{ unit_qty() }} +# num_units: {{ unit_qty() }} options: {% if os.ha.mode == 'ha' %} - vip: {{ opnfv.vip.heat }} +# vip: {{ opnfv.vip.heat }} {% endif %} {% if os.beta.public_api %} - os-public-hostname: api.{{ opnfv.domain }} +# os-public-hostname: api.{{ opnfv.domain }} {% endif %} to: -{% for unit_id in to_select() %} - - "lxc:nodes={{ unit_id }}" -{% endfor %} + - "lxc:nodes=0" |