From 89b3286ebc840a595abba8475829f352122735bc Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Fri, 18 May 2018 09:26:32 -0700 Subject: [PATCH] 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 --- api-ref/source/parameters.yaml | 7 +++---- nova/compute/api.py | 7 ------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml index 9a6820a441..3b50aaa841 100644 --- a/api-ref/source/parameters.yaml +++ b/api-ref/source/parameters.yaml @@ -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. diff --git a/nova/compute/api.py b/nova/compute/api.py index f66d69f8a0..b71b9bddc9 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -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,