2 files changed, 6 insertions, 3 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 %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
index 77318384..053da7cd 100644
--- a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
@@ -1,5 +1,5 @@
     openbaton:
-      charm: "./trusty/openbaton"
+      charm: ./{{ ubuntu.release }}/openbaton
       num_units: 1
 {% if os.service.bindings %}
       bindings: