diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-11-07 23:40:00 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-11-10 14:46:55 -0600 |
| commit | 3663f0a4d58783cd54905320bba9ebce33be1e65 (patch) | |
| tree | c5154487fca216b5cb7941190441b6b67a7d5511 /ci/config_tpl/juju2/bundle_tpl | |
| parent | 34dd0b2e19d2d50486364d18c594c87b77ba078e (diff) | |
modified to replace neutron with openstack commands.
Added intel pod19 labconfig as well. updated with comments.
Change-Id: I206da5afdfc1ed73f6fd589853bbbdf2bcc27e07
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 0568b38a..b8948e61 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -33,11 +33,7 @@ ceph-osd: charm: "./{{ ubuntu.release }}/ceph-osd" {% if os.hyperconverged %} -{% if opnfv.units >= 3 %} - num_units: {{ unit_ceph_qty() }} -{% else %} num_units: {{ opnfv.units }} -{% endif %} {% else %} num_units: 3 {% endif %} @@ -57,15 +53,9 @@ {% endif %} to: {% if os.hyperconverged %} -{% if opnfv.units >= 3 %} -{% for unit_id in range(0, 3) %} - - "nodes/{{ unit_id }}" -{% endfor %} -{% else %} - {% for unit_id in range(0, opnfv.units) %} +{% for unit_id in range(0, opnfv.units) %} - "nodes/{{ unit_id }}" - {% endfor %} -{% endif %} +{% endfor %} {% else %} {% if os.ha.mode == 'ha' %} {% for unit_id in range(0, 3) %} |