updated the source for ceph deployment.

[joid.git] / ci / config_tpl / bundle_tpl / bundle.yaml

diff --git a/ci/config_tpl/bundle_tpl/bundle.yaml b/ci/config_tpl/bundle_tpl/bundle.yaml
index a5aa557..6171081 100644 (file)
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -39,11 +39,17 @@ openstack-phase1:
 {% endif %}
 {% include 'mysql.yaml' %}
 {% include 'ceilometer.yaml' %}
+{% if opnfv.storage_dict.scaleio is defined %}
+{% include 'scaleio.yaml' %}
+{% else %}
 {% include 'ceph.yaml' %}
+{% endif %}
 {% include 'cinder.yaml' %}
 {% include 'glance.yaml' %}
+{% if opnfv.storage_dict.ceph is defined %}
 {% include 'opnfv-promise.yaml' %}
 {% include 'congress.yaml' %}
+{% endif %}
 {% include 'keystone.yaml' %}
 {% include 'nova-cloud-controller.yaml' %}
 {% include 'nova-compute.yaml' %}
@@ -64,6 +70,7 @@ openstack-phase1:
 {% include 'haclusters.yaml' %}
 {% endif %}
 
+
 {% if os.hyperconverged %}
   relations:
     - [ 'ntp:juju-info', 'nodes:juju-info' ]
@@ -72,6 +79,7 @@ openstack-phase1:
     - [ 'ntp:juju-info', 'nodes:juju-info' ]
     - [ 'ntp:juju-info', 'nodes-compute:juju-info' ]
 {% endif %}
+
 {% if os.ha.mode == 'ha' %}
 {% include 'harelations.yaml' %}
 {% endif %}