diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-04-06 15:21:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-06 15:21:37 +0000 |
| commit | a35b7cea80b694c3d7b44ac74e3929ee775c76ce (patch) | |
| tree | e12dbb2044dd4fcf4e4fde763c1f91f8b34490c7 /ci/config_tpl/juju2 | |
| parent | 50bab952e49d425b17c8306162bb3726a3ab6717 (diff) | |
| parent | 406e1c9445a528da391138836308f6375f83e3f9 (diff) | |
Merge "modfiied to support openbaton during the dpeloyment."
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 7 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/openbaton.yaml | 2 |
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: |