summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-08 00:43:12 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-08 00:43:44 -0500
commit19a7096fb6c225501f8fd48b3aed55349e48f482 (patch)
tree06116b90373d2ae62de17f2efd9d5da016cac6f2 /ci
parentd2d6923d759fbed5ad5147c95f9cb9f9051c8b11 (diff)
heat nonHA service works fine.
Change-Id: I8077984e84d6b0ac17b7fa34f72fe0dd05c0ba36 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci')
-rw-r--r--ci/config_tpl/bundle_tpl/haclusters.yaml12
-rw-r--r--ci/config_tpl/bundle_tpl/harelations.yaml2
-rw-r--r--ci/config_tpl/bundle_tpl/heat.yaml8
3 files changed, 12 insertions, 10 deletions
diff --git a/ci/config_tpl/bundle_tpl/haclusters.yaml b/ci/config_tpl/bundle_tpl/haclusters.yaml
index 59493d5f..7edc7b28 100644
--- a/ci/config_tpl/bundle_tpl/haclusters.yaml
+++ b/ci/config_tpl/bundle_tpl/haclusters.yaml
@@ -15,13 +15,13 @@
{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
- 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
{% if os.network.ipv6 %}
- prefer-ipv6: {{ os.network.ipv6 }}
+# prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
hacluster-horizon:
charm: "local:{{ ubuntu.release }}/hacluster"
diff --git a/ci/config_tpl/bundle_tpl/harelations.yaml b/ci/config_tpl/bundle_tpl/harelations.yaml
index e7bac9a2..d4c4c064 100644
--- a/ci/config_tpl/bundle_tpl/harelations.yaml
+++ b/ci/config_tpl/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/config_tpl/bundle_tpl/heat.yaml b/ci/config_tpl/bundle_tpl/heat.yaml
index 929981e3..16b76216 100644
--- a/ci/config_tpl/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/bundle_tpl/heat.yaml
@@ -1,6 +1,7 @@
heat:
charm: "local:{{ ubuntu.release }}/heat"
- num_units: {{ unit_qty() }}
+ #num_units: {{ unit_qty() }}
+ num_units: 1
options:
openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
region: {{ os.region }}
@@ -11,13 +12,14 @@
worker-multiplier: {{ os.api.worker_multiplier }}
{% endif %}
{% 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 }}
{% endif %}
to:
{% for unit_id in to_select() %}
- - "lxc:nodes={{ unit_id }}"
+ #- "lxc:nodes={{ unit_id }}"
+ - "lxc:nodes=0"
{% endfor %}
{# Empty block to avoid bad block trim #}