summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 11:18:53 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 11:18:53 +0000
commit93d87e069c526c17472f5c8b1a19f431342ef8fc (patch)
tree4c01e7c800591949fa578c1a5b2fbfb5bfa9c1bc
parent649586180621610a2b2a4e2d869513c4cb6c05a0 (diff)
parent4e38b2834469e170c4cbb0706091eda79822bd15 (diff)
Merge "Define default Image and Volume API versions in overcloudrc"
-rw-r--r--releasenotes/notes/cinder-and-glance-api-version-bca6acd809d4151c.yaml7
-rw-r--r--tripleo_common/constants.py6
-rw-r--r--tripleo_common/utils/overcloudrc.py2
3 files changed, 15 insertions, 0 deletions
diff --git a/releasenotes/notes/cinder-and-glance-api-version-bca6acd809d4151c.yaml b/releasenotes/notes/cinder-and-glance-api-version-bca6acd809d4151c.yaml
new file mode 100644
index 0000000..510a6ce
--- /dev/null
+++ b/releasenotes/notes/cinder-and-glance-api-version-bca6acd809d4151c.yaml
@@ -0,0 +1,7 @@
1---
2features:
3 - |
4 Set ``OS_VOLUME_API_VERSION`` and ``OS_IMAGE_API_VERSION`` in
5 ``overcloudrc`` in order to establish the default API versions for
6 the Volume and Image services. The values match the default major API
7 versions for Cinder (3) and Glance (2).
diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py
index 197fb8a..b7ba10a 100644
--- a/tripleo_common/constants.py
+++ b/tripleo_common/constants.py
@@ -111,6 +111,12 @@ PLAN_NAME_PATTERN = '^[a-zA-Z0-9-]+$'
111# 1.29 is the latest API version in Ironic Ocata supported by ironicclient. 111# 1.29 is the latest API version in Ironic Ocata supported by ironicclient.
112DEFAULT_BAREMETAL_API_VERSION = '1.29' 112DEFAULT_BAREMETAL_API_VERSION = '1.29'
113 113
114# The default version of the Image API to set in overcloudrc.
115DEFAULT_IMAGE_API_VERSION = '2'
116
117# The default version of the Volume API to set in overcloudrc.
118DEFAULT_VOLUME_API_VERSION = '3'
119
114# The name of the file which holds the Mistral environment contents for plan 120# The name of the file which holds the Mistral environment contents for plan
115# import/export 121# import/export
116PLAN_ENVIRONMENT = 'plan-environment.yaml' 122PLAN_ENVIRONMENT = 'plan-environment.yaml'
diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py
index 2f9d41d..369d692 100644
--- a/tripleo_common/utils/overcloudrc.py
+++ b/tripleo_common/utils/overcloudrc.py
@@ -101,6 +101,8 @@ def create_overcloudrc(stack, no_proxy, admin_password):
101 'OS_AUTH_URL': overcloud_endpoint, 101 'OS_AUTH_URL': overcloud_endpoint,
102 'OS_BAREMETAL_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION, 102 'OS_BAREMETAL_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION,
103 'IRONIC_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION, 103 'IRONIC_API_VERSION': constants.DEFAULT_BAREMETAL_API_VERSION,
104 'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION,
105 'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION,
104 } 106 }
105 107
106 overcloudrc = CLEAR_ENV 108 overcloudrc = CLEAR_ENV