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 8c08c1a..6171081 100644 (file)
--- a/ci/config_tpl/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/bundle_tpl/bundle.yaml
@@ -9,9 +9,27 @@
 
 openstack-phase1:
   services:
+{% if os.hyperconverged %}
     nodes:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
       num_units: {{ opnfv.units }}
+{% else %}
+    nodes:
+      charm: "cs:{{ ubuntu.release }}/ubuntu"
+{% if os.ha.mode == 'ha' %}
+      num_units: 3
+{% else %}
+      num_units: 1
+{% endif %}
+      constraints: tags=control
+    nodes-compute:
+      charm: "cs:{{ ubuntu.release }}/ubuntu"
+{% if os.ha.mode == 'ha' %}
+      num_units: {{ opnfv.units - 3 }}
+{% else %}
+      num_units: {{ opnfv.units - 1 }}
+{% endif %}
+{% endif %}
     ntp:
       charm: "local:{{ ubuntu.release }}/ntp"
 {% if os.network.controller == 'ocl' %}
@@ -21,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' %}
@@ -46,8 +70,16 @@ openstack-phase1:
 {% include 'haclusters.yaml' %}
 {% endif %}
 
+
+{% if os.hyperconverged %}
   relations:
     - [ 'ntp:juju-info', 'nodes:juju-info' ]
+{% else %}
+  relations:
+    - [ 'ntp:juju-info', 'nodes:juju-info' ]
+    - [ 'ntp:juju-info', 'nodes-compute:juju-info' ]
+{% endif %}
+
 {% if os.ha.mode == 'ha' %}
 {% include 'harelations.yaml' %}
 {% endif %}