From 94963cf5bd62fd935c43ff62dfa2f6926c2faee8 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 23 Oct 2020 13:10:30 -0600
Subject: [PATCH] Remove undercloud_update_packages

This option has no effect since we switched to containerized undercloud.

Change-Id: Id7fab99131153405361422bd4322ebd55482616b
---
 ...remove-undercloud_update_packages-1fa2b7a1afda3258.yaml | 4 ++++
 tripleoclient/config/undercloud.py                         | 7 -------
 tripleoclient/tests/config/test_config_undercloud.py       | 6 ++----
 3 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/remove-undercloud_update_packages-1fa2b7a1afda3258.yaml

diff --git a/releasenotes/notes/remove-undercloud_update_packages-1fa2b7a1afda3258.yaml b/releasenotes/notes/remove-undercloud_update_packages-1fa2b7a1afda3258.yaml
new file mode 100644
index 000000000..b998a6241
--- /dev/null
+++ b/releasenotes/notes/remove-undercloud_update_packages-1fa2b7a1afda3258.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Remove `undercloud_update_packages` option in undercloud.conf.
diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index f8ed4c4ca..dac859797 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -276,13 +276,6 @@ class UndercloudConfig(StandaloneConfig):
                         default=True,
                         help=_('Enable or disable SELinux during the '
                                'deployment.')),
-            cfg.BoolOpt('undercloud_update_packages',
-                        default=False,
-                        help=_(
-                            'Whether to update packages during the Undercloud '
-                            'install. This is a no-op for containerized '
-                            'undercloud.')
-                        ),
             cfg.StrOpt('ipa_otp',
                        default='',
                        help=_(
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index b292140a4..81e62a5ab 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -75,8 +75,7 @@ class TestUndercloudConfig(base.TestCase):
                     'undercloud_ntp_servers',
                     'undercloud_public_host',
                     'undercloud_service_certificate',
-                    'undercloud_timezone',
-                    'undercloud_update_packages']
+                    'undercloud_timezone']
         self.assertEqual(expected, [x.name for x in ret])
 
     def test_get_opts(self):
@@ -141,8 +140,7 @@ class TestUndercloudConfig(base.TestCase):
                     'undercloud_ntp_servers',
                     'undercloud_public_host',
                     'undercloud_service_certificate',
-                    'undercloud_timezone',
-                    'undercloud_update_packages']
+                    'undercloud_timezone']
         self.assertEqual(expected, [x.name for x in ret])
 
     def test_get_subnet_opts(self):