From d7321f8223363ac26878a22d1fd1f04c201732fe Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 7 Oct 2016 08:28:53 -0500 Subject: enabling heat cluster for experiment. Change-Id: Id8192abb141596a2b6b5144447985f02d74b513f Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/cinder.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl/bundle_tpl/cinder.yaml') 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" -- cgit 1.2.3-korg