openstack
/
ironic
Code Issues Proposed changes

Adds 9.0 to release_mappings 

We just released 9.0.0, so this adds '9.0' and 'pike' to the list of
releases that can be specified, for rolling upgrades.

Change-Id: Ib3d2c662f96c0c5eb308b3db5be1874dcc63a274
(cherry picked from commit 6e5d3653f1)
This commit is contained in:
Ruby Loo 2017-08-17 11:59:25 -04:00 committed by Julia Kreger
parent 9d914c8593
commit 879febe702
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,7 +368,7 @@
# (default), leave it unset and the latest versions of RPC
# communication and database objects will be used. (string
# value)
# Allowed values: ocata, 8.0, 7.0
# Allowed values: pike, ocata, 9.0, 8.0, 7.0
#pin_release_version = <None>
# Path to the rootwrap configuration file to use for running
@ -468,7 +468,7 @@
# List of package logging levels in logger=LEVEL pairs. This
# option is ignored if log_config_append is set. (list value)
#default_log_levels = amqp=WARNING,amqplib=WARNING,qpid.messaging=INFO,oslo_messaging=INFO,oslo.messaging=INFO,sqlalchemy=WARNING,stevedore=INFO,eventlet.wsgi.server=INFO,iso8601=WARNING,paramiko=WARNING,requests=WARNING,neutronclient=WARNING,glanceclient=WARNING,urllib3.connectionpool=WARNING,keystonemiddleware.auth_token=INFO,keystoneauth.session=INFO
#default_log_levels = amqp=WARNING,amqplib=WARNING,qpid.messaging=INFO,oslo_messaging=INFO,oslo.messaging=INFO,sqlalchemy=WARNING,stevedore=INFO,eventlet.wsgi.server=INFO,iso8601=WARNING,requests=WARNING,neutronclient=WARNING,glanceclient=WARNING,urllib3.connectionpool=WARNING,keystonemiddleware.auth_token=INFO,keystoneauth.session=INFO
# Enables or disables publication of error events. (boolean
# value)

19
ironic/common/release_mappings.py
View File

@ -78,6 +78,18 @@ RELEASE_MAPPING = {
'VolumeTarget': ['1.0'],
}
},
'9.0': {
'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': {
'rpc': '1.41',
'objects': {
@ -94,14 +106,17 @@ RELEASE_MAPPING = {
# NOTE(xek): Assign each named release to the appropriate semver.
#
# Just before we do a new named release, add a mapping for the new
# named release.
# Just before we do a new named release (more specifically, create
# a stable/<release> branch), add a mapping for the new
# named release. This is needed; otherwise CI (grenade) that tests
# old/new (i.e., new-release -> master) will fail.
#
# Just after we do a new named release, delete the oldest named
# release (that we are no longer supporting for a rolling upgrade).
#
# There should be at most two named mappings here.
RELEASE_MAPPING['ocata'] = RELEASE_MAPPING['7.0']
RELEASE_MAPPING['pike'] = RELEASE_MAPPING['9.0']
# List of available versions with named versions first; 'master' is excluded.
RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True)