diff options
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl')
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 14 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 | ||||
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 3 |
3 files changed, 5 insertions, 14 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) %} diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 233d1d72..1c6b78f6 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -17,9 +17,7 @@ region: *openstack-region admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} -{% if os.network.controller != 'ocl' %} preferred-api-version: 3 -{% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index e59530c1..823e251a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -37,6 +37,9 @@ {% elif os.network.controller == 'onos' %} flat-network-providers: physnet1 manage-neutron-plugin-legacy-mode: False +{% elif os.network.controller == 'ocl' %} + flat-network-providers: physnet1 + manage-neutron-plugin-legacy-mode: False {% endif %} {% if os.network.dvr %} enable-dvr: true |