From 7f64a501c3dd95d20c25e4872226b10dbec207fc Mon Sep 17 00:00:00 2001 From: Ruby Loo Date: Thu, 24 Aug 2017 18:12:43 -0400 Subject: Disallow rolling upgrade from Ocata to Queens Now that we've released Pike and master is open for Queens development, we need to remove the release mapping information for Ocata, to prevent unsupported rolling upgrades from Ocata to Queens. We only support rolling upgrades from Pike to Queens (master). Change-Id: I440b9a4c8ef6024a47b66b0de4fd841b7f15df2e --- etc/ironic/ironic.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 49fcda310..dafcfb130 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -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: pike, ocata, 9.1, 9.0, 8.0, 7.0 +# Allowed values: pike, 9.1, 9.0, 8.0 #pin_release_version = # Path to the rootwrap configuration file to use for running @@ -3657,8 +3657,8 @@ # Minimum value: 0 #udp_transport_timeout = 1.0 -# Maximum number of UDP request retries, 0 means just a single -# request. (integer value) +# Maximum number of UDP request retries, 0 means no retries. +# (integer value) # Minimum value: 0 #udp_transport_retries = 5 -- cgit v1.2.1