diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2018-01-23 00:37:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-23 00:37:41 +0000 |
| commit | 0890aa54bbc3bc8727757961b2167bce8a542081 (patch) | |
| tree | 957c48bd18c93d7beea64c94c80a2eba451d47df /ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | |
| parent | 0aa248898dee5addd21d391dedfcf143501e78ca (diff) | |
| parent | aadc493bf402476ae10f526403591f9f21d8e715 (diff) | |
Merge "modified to enable the DVR on the deployment by default."
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml index 3c3a7200..6e084d15 100644 --- a/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/nova-compute.yaml @@ -1,7 +1,11 @@ nova-compute: charm: "./{{ ubuntu.release }}/nova-compute" {% if os.hyperconverged %} - num_units: {{ opnfv.units - 1 }} +{% if os.ha.mode == 'ha' %} + num_units: {{ opnfv.units - 2 }} +{% else %} + num_units: {{ opnfv.units - 1 }} +{% endif %} {% else %} {% if os.ha.mode == 'ha' %} num_units: {{ opnfv.units - 3 }} @@ -39,9 +43,15 @@ {% endif %} to: {% if os.hyperconverged %} +{% if os.ha.mode == 'ha' %} +{% for unit_id in range(2, opnfv.units) %} + - "nodes/{{ unit_id }}" +{% endfor %} +{% else %} {% for unit_id in range(1, opnfv.units) %} - "nodes/{{ unit_id }}" {% endfor %} +{% endif %} {% else %} {% if os.ha.mode == 'ha' %} {% for unit_id in range(0, opnfv.units - 3) %} |