summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-04-06 15:21:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-06 15:21:37 +0000
commita35b7cea80b694c3d7b44ac74e3929ee775c76ce (patch)
treee12dbb2044dd4fcf4e4fde763c1f91f8b34490c7 /ci/config_tpl/juju2/bundle_tpl/bundle.yaml
parent50bab952e49d425b17c8306162bb3726a3ab6717 (diff)
parent406e1c9445a528da391138836308f6375f83e3f9 (diff)
Merge "modfiied to support openbaton during the dpeloyment."
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/bundle.yaml')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/bundle.yaml7
1 files changed, 5 insertions, 2 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index 9a46126d..5f3b5e8b 100644
--- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@ -36,16 +36,16 @@
{% else %}
{% include 'ceph.yaml' %}
{% endif %}
+{% if opnfv.storage_dict.ceph is defined %}
{% include 'cinder.yaml' %}
{% include 'glance.yaml' %}
-{% if opnfv.storage_dict.ceph is defined %}
+{% endif %}
{% if os.service.promise %}
{% include 'opnfv-promise.yaml' %}
{% endif %}
{% if os.service.congress %}
{% include 'congress.yaml' %}
{% endif %}
-{% endif %}
{% if os.service.openbaton %}
{% include 'openbaton.yaml' %}
{% endif %}
@@ -83,3 +83,6 @@
{% include 'harelations.yaml' %}
{% endif %}
{% include 'relations.yaml' %}
+{% if os.mano.mode == 'ha' %}
+{% include 'harelations.yaml' %}
+{% endif %}