From ffb6cf7b4a221d957ba697ad81216d9b75bd53de Mon Sep 17 00:00:00 2001
From: Dan Smith <dansmith@redhat.com>
Date: Thu, 11 Oct 2018 08:59:26 -0700
Subject: [PATCH] Make sure nova-compute is not configured with database access

Apparently we're inheriting some database config from the main file,
which should not be set for nova-compute. If we're properly in superconductor
mode where we have a dedicated config for compute, remove those lines
if present.

Closes-Bug: #1797413

Change-Id: I4820abe57a023050dd8d067c77e26028801ff288
(cherry picked from commit 7d0003ef7ed2c2609ffe6782e0ce6147f9c9a3bf)
---
 lib/nova | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/nova b/lib/nova
index cd568f95db..79ffb4dcdd 100644
--- a/lib/nova
+++ b/lib/nova
@@ -881,6 +881,9 @@ function start_nova_compute {
         # RPC, we also disable track_instance_changes.
         iniset $NOVA_CPU_CONF filter_scheduler track_instance_changes False
         iniset_rpc_backend nova $NOVA_CPU_CONF DEFAULT "nova_cell${NOVA_CPU_CELL}"
+        # Make sure we nuke any database config
+        inidelete $NOVA_CPU_CONF database connection
+        inidelete $NOVA_CPU_CONF api_database connection
     fi
 
     if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then