added option to choose the architecture of hyperconverged ot not.

[joid.git] / ci / config_tpl / bundle_tpl / nova-compute.yaml

diff --git a/ci/config_tpl/bundle_tpl/nova-compute.yaml b/ci/config_tpl/bundle_tpl/nova-compute.yaml
index 8180380..24a8125 100644 (file)
--- a/ci/config_tpl/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/bundle_tpl/nova-compute.yaml
@@ -1,6 +1,14 @@
     nova-compute:
       charm: "local:{{ ubuntu.release }}/nova-compute"
+{% if os.hyperconverged %}
       num_units: {{ opnfv.units - 1 }}
+{% else %}
+{% if os.ha.mode == 'ha' %}
+      num_units: {{ opnfv.units - 3 }}
+{% else %}
+      num_units: {{ opnfv.units - 1 }}
+{% endif %}
+{% endif %}
       options:
         enable-live-migration: true
         enable-resize: true
@@ -13,6 +21,18 @@
         virt-type: lxd
 {% endif %}
       to:
+{% if os.hyperconverged %}
 {% for unit_id in range(1, opnfv.units) %}
         - "nodes={{ unit_id }}"
 {% endfor %}
+{% else %}
+{% if os.ha.mode == 'ha' %}
+{% for unit_id in range(0, opnfv.units - 3) %}
+        - "nodes-compute={{ unit_id }}"
+{% endfor %}
+{% else %}
+{% for unit_id in range(0, opnfv.units - 1) %}
+        - "nodes-compute={{ unit_id }}"
+{% endfor %}
+{% endif %}
+{% endif %}