diff options
Diffstat (limited to 'ci/config_tpl/bundle_tpl/cinder.yaml')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/cinder.yaml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ci/config_tpl/bundle_tpl/cinder.yaml b/ci/config_tpl/bundle_tpl/cinder.yaml index bf3fb04c..dee6be08 100644 --- a/ci/config_tpl/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/bundle_tpl/cinder.yaml @@ -8,6 +8,14 @@ options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} + block-device: None + glance-api-version: 2 +{% if os.beta.public_api %} + use-internal-endpoints: true +{% endif %} +{% if os.network.ipv6 %} + prefer-ipv6: {{ os.network.ipv6 }} +{% endif %} {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} @@ -20,8 +28,6 @@ {% if os.beta.public_api %} os-public-hostname: api.{{ opnfv.domain }} {% endif %} - block-device: None - glance-api-version: 2 to: {% if opnfv.storage_dict.scaleio is defined %} - "nodes=0" |