openstack/ironic
Code Issues Proposed changes

Merge "Add 9.1 to release_mappings"

Browse Source
This commit is contained in:
Jenkins 2017-08-21 11:59:21 +00:00 committed by Gerrit Code Review
commit 880d1378cc
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/ironic/ironic.conf.sample
View File

@ -368,7 +368,7 @@
# (default), leave it unset and the latest versions of RPC # (default), leave it unset and the latest versions of RPC
# communication and database objects will be used. (string # communication and database objects will be used. (string
# value) # value)
# Allowed values: pike, ocata, 9.0, 8.0, 7.0 # Allowed values: pike, ocata, 9.1, 9.0, 8.0, 7.0
#pin_release_version = <None> #pin_release_version = <None>
# Path to the rootwrap configuration file to use for running # Path to the rootwrap configuration file to use for running

21
ironic/common/release_mappings.py
View File

@ -90,6 +90,18 @@ RELEASE_MAPPING = {
'VolumeTarget': ['1.0'], 'VolumeTarget': ['1.0'],
} }
}, },
'9.1': {
'rpc': '1.41',
'objects': {
'Node': ['1.21'],
'Conductor': ['1.2'],
'Chassis': ['1.3'],
'Port': ['1.7'],
'Portgroup': ['1.3'],
'VolumeConnector': ['1.0'],
'VolumeTarget': ['1.0'],
}
},
'master': { 'master': {
'rpc': '1.41', 'rpc': '1.41',
'objects': { 'objects': {
@ -107,16 +119,17 @@ RELEASE_MAPPING = {
# NOTE(xek): Assign each named release to the appropriate semver. # NOTE(xek): Assign each named release to the appropriate semver.
# #
# Just before we do a new named release (more specifically, create # Just before we do a new named release (more specifically, create
# a stable/<release> branch), add a mapping for the new # a stable/<release> branch), add a mapping for the new named
# named release. This is needed; otherwise CI (grenade) that tests # release. This is needed; otherwise CI: a unit test (common.
# old/new (i.e., new-release -> master) will fail. # ReleaseMappingsTestCase.test_contains_current_release_entry())
# and grenade that tests old/new (new-release -> master) will fail.
# #
# Just after we do a new named release, delete the oldest named # Just after we do a new named release, delete the oldest named
# release (that we are no longer supporting for a rolling upgrade). # release (that we are no longer supporting for a rolling upgrade).
# #
# There should be at most two named mappings here. # There should be at most two named mappings here.
RELEASE_MAPPING['ocata'] = RELEASE_MAPPING['7.0'] RELEASE_MAPPING['ocata'] = RELEASE_MAPPING['7.0']
RELEASE_MAPPING['pike'] = RELEASE_MAPPING['9.0'] RELEASE_MAPPING['pike'] = RELEASE_MAPPING['9.1']
# List of available versions with named versions first; 'master' is excluded. # List of available versions with named versions first; 'master' is excluded.
RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True) RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True)