X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fbundle_tpl%2Fnova-compute.yaml;h=0311889972b16827163d326ca9b189be2b588fba;hb=refs%2Fchanges%2F21%2F22621%2F1;hp=8180380765a88ca53e96ed3702c83e6adc003379;hpb=0f81e81552bdf0053fc0303c53dff455c17d56a6;p=joid.git

diff --git a/ci/config_tpl/bundle_tpl/nova-compute.yaml b/ci/config_tpl/bundle_tpl/nova-compute.yaml
index 81803807..03118899 100644
--- a/ci/config_tpl/bundle_tpl/nova-compute.yaml
+++ b/ci/config_tpl/bundle_tpl/nova-compute.yaml
@@ -1,10 +1,17 @@
     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
-        manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
 {% if os.beta.huge_pages %}
         hugepages: "50%"
@@ -13,6 +20,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 %}