From cd52cce7f78e7dc30dfbab0b73552d55447b1000 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Wed, 24 Jun 2020 10:16:20 +0200
Subject: [PATCH] Remove amp_ssH_access_allowed option

This option entered deprecation in Queens and is used no where nowadays.

Change-Id: I3734a9083fa83174c530b65128baee2fe0e593d7
---
 octavia/common/config.py                                 | 9 ---------
 .../controller/worker/v1/tasks/test_compute_tasks.py     | 2 --
 .../controller/worker/v2/tasks/test_compute_tasks.py     | 2 --
 .../remove-amp-ssh-access-allowed-e11dc011637b21dd.yaml  | 6 ++++++
 4 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove-amp-ssh-access-allowed-e11dc011637b21dd.yaml

diff --git a/octavia/common/config.py b/octavia/common/config.py
index c9aee0e3e4..ab3cfef098 100644
--- a/octavia/common/config.py
+++ b/octavia/common/config.py
@@ -452,15 +452,6 @@ controller_worker_opts = [
                default='',
                help=_('Optional SSH keypair name, in nova, that will be used '
                       'for the authorized_keys inside the amphora.')),
-    cfg.BoolOpt('amp_ssh_access_allowed',
-                default=True,
-                deprecated_for_removal=True,
-                deprecated_reason='This option and amp_ssh_key_name overlap '
-                                  'in functionality, and only one is needed. '
-                                  'SSH access can be enabled/disabled simply '
-                                  'by setting amp_ssh_key_name, or not.',
-                help=_('Determines whether or not to allow access '
-                       'to the Amphorae')),
     cfg.ListOpt('amp_boot_network_list',
                 default='',
                 help=_('List of networks to attach to the Amphorae. '
diff --git a/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py b/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py
index 7efa03d9e4..2ce28a3a4d 100644
--- a/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py
+++ b/octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py
@@ -297,8 +297,6 @@ class TestComputeTasks(base.TestCase):
         createcompute = compute_tasks.ComputeCreate()
 
         mock_driver.build.return_value = COMPUTE_ID
-        self.conf.config(
-            group="controller_worker", amp_ssh_access_allowed=False)
         self.conf.config(
             group="controller_worker", user_data_config_drive=False)
         mock_log_cfg.return_value = 'FAKE CFG'
diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py
index f92736f63d..14eda73b3b 100644
--- a/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py
+++ b/octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py
@@ -307,8 +307,6 @@ class TestComputeTasks(base.TestCase):
         createcompute = compute_tasks.ComputeCreate()
 
         mock_driver.build.return_value = COMPUTE_ID
-        self.conf.config(
-            group="controller_worker", amp_ssh_access_allowed=False)
         self.conf.config(
             group="controller_worker", user_data_config_drive=False)
         mock_log_cfg.return_value = 'FAKE CFG'
diff --git a/releasenotes/notes/remove-amp-ssh-access-allowed-e11dc011637b21dd.yaml b/releasenotes/notes/remove-amp-ssh-access-allowed-e11dc011637b21dd.yaml
new file mode 100644
index 0000000000..4bb121a25e
--- /dev/null
+++ b/releasenotes/notes/remove-amp-ssh-access-allowed-e11dc011637b21dd.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The option ``[controller_worker]/amp_ssh_access_allowed`` has been
+    deprecated since Queens release and is now removed. This option was
+    superseded by ``[controller_worker]/amp_ssh_key_name`` option.