From fd6da36ab54fa7d1e45a301fd58ccfb551fbfd37 Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 8 May 2019 09:35:30 -0500 Subject: [PATCH] Always deploy placement authtoken config The placement service is required, nova cannot start without it, so we must always configure the authtoken even if the flag to deploy the integrated nova-placement-api is disabled. This will enable the ability to move placement into a separate service, disable the nova-placement-api deployment, yet still configure the required authtoken in nova.conf. Depends-On: I58788af6f02a4b339a270dff69a86ce7cdea41d3 Change-Id: I4619d333187a0e96c1b60fe2f203df0838c12059 --- templates/nova.conf.j2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index d8e48c69..dca9981f 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -167,9 +167,6 @@ notify_on_state_change = vm_and_task_state notification_format = {% if nova_versioned_notification_enabled %}both{% else %}unversioned{% endif %} {% endif %} - -{% if nova_placement_service_enabled | bool %} -# Placement [placement] region_name = {{ nova_placement_service_region }} valid_interfaces = {{ nova_placement_service_interface }} @@ -181,7 +178,6 @@ user_domain_name = {{ nova_placement_service_user_domain_id }} project_domain_name = {{ nova_placement_service_project_domain_id }} auth_url = {{ keystone_service_adminurl }} insecure = {{ keystone_service_adminuri_insecure | bool }} -{% endif %} [conductor] workers = {{ nova_conductor_workers | default(nova_api_threads) }}