openstack/nova
Code Issues Proposed changes

Merge "Remove the remaining of the removed option"

Browse Source
This commit is contained in:
Zuul 2018-05-22 20:03:06 +00:00 committed by Gerrit Code Review
commit 8ede37e8b1
2 changed files with 3 additions and 11 deletions
api-ref/source
parameters.yaml
nova/compute
api.py

7
api-ref/source/parameters.yaml

@ -5769,10 +5769,9 @@ servers_multiple_create_name:
description: | description: |
A base name for creating unique names during multiple create. A A base name for creating unique names during multiple create. A
unique string will be appended to the end of this base name for unique string will be appended to the end of this base name for
every server created. The templete is defined in every server created.
``multi_instance_display_name_template`` option in the configuration file. The server names become ``{name}-1``, ``{name}-2``, ``{name}-3``,
The server names become ``{name}-1``, ``{name}-2``, ``{name}-3``, ... etc.
by default.
service: service:
description: | description: |
Object representing a compute service. Object representing a compute service.

7
nova/compute/api.py

@ -1411,13 +1411,6 @@ class API(base.Base):
instance.display_name = display_name instance.display_name = display_name
if hostname is None and num_instances == 1: if hostname is None and num_instances == 1:
# NOTE(russellb) In the multi-instance case, we're going to
# overwrite the display_name using the
# multi_instance_display_name_template. We need the default
# display_name set so that it can be used in the template, though.
# Only set the hostname here if we're only creating one instance.
# Otherwise, it will be built after the template based
# display_name.
hostname = display_name hostname = display_name
default_hostname = self._default_host_name(instance.uuid) default_hostname = self._default_host_name(instance.uuid)
instance.hostname = utils.sanitize_hostname(hostname, instance.hostname = utils.sanitize_hostname(hostname,