openstack
/
nova
Code Issues Proposed changes

Remove the remaining of the removed option 

Since I8ae8507a089df4d0a32be5fbc615e2166f44516e the config option
multi_instance_display_name_template has been removed.
So this patch removes the remaining of the option.

Change-Id: I81fa2588d85c803415aadf6150ed6cdd7a0fe6d1
This commit is contained in:
Ken'ichi Ohmichi 2018-05-18 09:26:32 -07:00 committed by Matt Riedemann
parent 04469a5181
commit 89b3286ebc
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api-ref/source/parameters.yaml
View File

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

7
nova/compute/api.py
View File

@ -1411,13 +1411,6 @@ class API(base.Base):
instance.display_name = display_name
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
default_hostname = self._default_host_name(instance.uuid)
instance.hostname = utils.sanitize_hostname(hostname,