Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
enable heat for OCL and try.
[joid.git]
/
ci
/
config_tpl
/
juju2
/
bundle_tpl
/
haclusters.yaml
diff --git
a/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
b/ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
index
091fa7e
..
26ea286
100644
(file)
--- a/
ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
+++ b/
ci/config_tpl/juju2/bundle_tpl/haclusters.yaml
@@
-15,7
+15,6
@@
{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
{% endif %}
-{% if os.network.controller != 'ocl' %}
hacluster-heat:
charm: "./{{ ubuntu.release }}/hacluster"
options:
hacluster-heat:
charm: "./{{ ubuntu.release }}/hacluster"
options:
@@
-23,7
+22,6
@@
cluster_count: 3
{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
cluster_count: 3
{% if os.network.ipv6 %}
prefer-ipv6: {{ os.network.ipv6 }}
-{% endif %}
{% endif %}
hacluster-horizon:
charm: "./{{ ubuntu.release }}/hacluster"
{% endif %}
hacluster-horizon:
charm: "./{{ ubuntu.release }}/hacluster"