From 30bc8b15b0bd57b24d31e029a1aa424be2debc34 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Thu, 3 Sep 2020 14:20:55 +0530
Subject: [PATCH] Disable nova by default on undercloud

Depends-On: https://review.opendev.org/749678
Partial-Bug: #1891242
Change-Id: Ifa4a94a6958bc8f5d16d4016ba8d4a6e3ca6f647
---
 tripleoclient/config/undercloud.py                   | 2 +-
 tripleoclient/tests/config/test_config_undercloud.py | 2 +-
 tripleoclient/v1/undercloud_config.py                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index 59130bb8e..81838d08e 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -75,7 +75,7 @@ class UndercloudConfig(StandaloneConfig):
             ironic=True,
             ironic_inspector=True,
             mistral=True,
-            nova=True,
+            nova=False,
             novajoin=False,
             tempest=True,
             telemetry=False,
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index 1ae891f6c..84ca34002 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -172,7 +172,7 @@ class TestUndercloudConfig(base.TestCase):
                     'enable_ironic': True,
                     'enable_ironic_inspector': True,
                     'enable_mistral': True,
-                    'enable_nova': True,
+                    'enable_nova': False,
                     'enable_novajoin': False,
                     'enable_telemetry': False,
                     'enable_tempest': True,
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index f54712849..97bfa237f 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -608,10 +608,10 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
         _process_drivers_and_hardware_types(CONF, env_data)
         _process_ipa_args(CONF, env_data)
 
-    if not CONF.get('enable_nova', True):
+    if CONF.get('enable_nova'):
         deploy_args += [
             '-e', os.path.join(
-                tht_templates, 'environments/undercloud-disable-nova.yaml')
+                tht_templates, 'environments/undercloud-enable-nova.yaml')
             ]
 
     if CONF.get('enable_mistral'):