Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
enabling heat cluster for experiment.
[joid.git]
/
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
bf3fb04
..
dee6be0
100644
(file)
--- 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 }}
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 %}
{% 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 %}
{% 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"
to:
{% if opnfv.storage_dict.scaleio is defined %}
- "nodes=0"