openstack
/
nova
Code Issues Proposed changes

Fix default_availability_zone docs 

The default_availability_zone description incorrectly mentioned about
the VM that is being booted.

To save confusion in the future between default_availability_zone and
default_schedule_zone, I have moved them into the same file.

default_schedule_zone didn't previous define what None meant, that has
also been corrected in this change.

Change-Id: I370e1309f7b2e01ad76d5345c6fe5d0443942fec
Closes-Bug: #1668542
Co-Authored-By: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
John Garbutt 2017-02-28 09:54:21 +00:00 committed by Stephen Finucane
parent ad1e34e923
commit 4814cfb9da
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nova/conf/availability_zone.py
View File

@ -20,32 +20,42 @@ availability_zone_opts = [
cfg.StrOpt('internal_service_availability_zone',
default='internal',
help="""
This option specifies the name of the availability zone for the
internal services. Services like nova-scheduler, nova-network,
nova-conductor are internal services. These services will appear in
their own internal availability_zone.
Availability zone for internal services.
This option determines the availability zone for the various internal nova
services, such as 'nova-scheduler', 'nova-conductor', etc.
Possible values:
* Any string representing an availability zone name
* 'internal' is the default value
* Any string representing an existing availability zone name.
"""),
cfg.StrOpt('default_availability_zone',
default='nova',
help="""
Default compute node availability_zone.
Default availability zone for compute services.
This option determines the availability zone to be used when it is not
specified in the VM creation request. If this option is not set,
the default availability zone 'nova' is used.
This option determines the default availability zone for 'nova-compute'
services, which will be used if the service(s) do not belong to aggregates with
availability zone metadata.
Possible values:
* Any string representing an availability zone name
* 'nova' is the default value
* Any string representing an existing availability zone name.
"""),
cfg.StrOpt('default_schedule_zone',
help="""
Default availability zone for instances.
""")
This option determines the default availability zone for instances, which will
be used when a user does not specify one when creating an instance. The
instance(s) will be bound to this availability zone for their lifetime.
Possible values:
* Any string representing an existing availability zone name.
* None, which means that the instance can move from one availability zone to
another during its lifetime if it is moved from one compute node to another.
"""),
]

13
nova/conf/compute.py
View File

@ -51,19 +51,6 @@ testing in single-host environments. By default it is not allowed
to resize to the same host. Setting this option to true will add
the same host to the destination options. Also set to true
if you allow the ServerGroupAffinityFilter and need to resize.
"""),
cfg.StrOpt('default_schedule_zone',
help="""
Availability zone to use when user doesn't specify one.
This option is used by the scheduler to determine which availability
zone to place a new VM instance into if the user did not specify one
at the time of VM boot request.
Possible values:
* Any string representing an availability zone name
* Default value is None.
"""),
cfg.ListOpt('non_inheritable_image_properties',
default=['cache_in_nova', 'bittorrent'],