Merge "Document unset/reset wrinkle for *_allocation_ratio options" into stable/pike

1 files changed, 9 insertions, 3 deletions

diff --git a/nova/conf/compute.py b/nova/conf/compute.py
index f7eeca90a3..91104b2af3 100644
--- a/nova/conf/compute.py
+++ b/nova/conf/compute.py
@@ -425,7 +425,9 @@ configuration value if no per-aggregate setting is found.
 
 NOTE: This can be set per-compute, or if set to 0.0, the value
 set on the scheduler node(s) or compute node(s) will be used
-and defaulted to 16.0.
+and defaulted to 16.0. Once set to a non-default value, it is not possible
+to "unset" the config to get back to the default behavior. If you want
+to reset back to the default, explicitly specify 16.0.
 
 NOTE: As of the 16.0.0 Pike release, this configuration option is ignored
 for the ironic.IronicDriver compute driver and is hardcoded to 1.0.
@@ -452,7 +454,9 @@ configuration value if no per-aggregate setting found.
 
 NOTE: This can be set per-compute, or if set to 0.0, the value
 set on the scheduler node(s) or compute node(s) will be used and
-defaulted to 1.5.
+defaulted to 1.5. Once set to a non-default value, it is not possible
+to "unset" the config to get back to the default behavior. If you want
+to reset back to the default, explicitly specify 1.5.
 
 NOTE: As of the 16.0.0 Pike release, this configuration option is ignored
 for the ironic.IronicDriver compute driver and is hardcoded to 1.0.
@@ -483,7 +487,9 @@ instances.
 
 NOTE: This can be set per-compute, or if set to 0.0, the value
 set on the scheduler node(s) or compute node(s) will be used and
-defaulted to 1.0.
+defaulted to 1.0. Once set to a non-default value, it is not possible
+to "unset" the config to get back to the default behavior. If you want
+to reset back to the default, explicitly specify 1.0.
 
 NOTE: As of the 16.0.0 Pike release, this configuration option is ignored
 for the ironic.IronicDriver compute driver and is hardcoded to 1.0.