diff options
| author | Zuul <zuul@review.openstack.org> | 2017-10-18 16:14:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-18 16:14:22 +0000 |
| commit | 6d145767448c971d63279755dad38af7a547abca (patch) | |
| tree | c6009948ca985aaaf4125829bb204550c5110d2e /etc | |
| parent | 45df95c51ed003034f98575548576b558c8009c6 (diff) | |
| parent | 7f64a501c3dd95d20c25e4872226b10dbec207fc (diff) | |
| download | ironic-6d145767448c971d63279755dad38af7a547abca.tar.gz | |
Merge "Disallow rolling upgrade from Ocata to Queens"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 6 |
1 files changed, 3 insertions, 3 deletions
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 = <None> # 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 |