diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-20 11:39:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-20 11:39:45 +0000 |
| commit | ddfd21b52b73a06569b1806e31f9c37408d2cba2 (patch) | |
| tree | 30810c3b4ffaf79ab505a914b2b824979c320efd /ci/config_tpl/juju2/bundle_tpl/bundle.yaml | |
| parent | 20d6606f935dd78017de5deba6584ca27e24f694 (diff) | |
| parent | c3cbf58b02524310c303b1c30662ce18c1dbd748 (diff) | |
Merge "added for newton support and integration."
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/bundle.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index 1698f0d3..b0a0e861 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -39,9 +39,13 @@ {% include 'cinder.yaml' %} {% include 'glance.yaml' %} {% if opnfv.storage_dict.ceph is defined %} +{% if os.service.promise %} {% include 'opnfv-promise.yaml' %} +{% endif %} +{% if os.service.congress %} {% include 'congress.yaml' %} {% endif %} +{% endif %} {% include 'keystone.yaml' %} {% include 'nova-cloud-controller.yaml' %} {% include 'nova-compute.yaml' %} |