Merge "Remove amp_ssH_access_allowed option"

octavia/common/config.py

@@ -442,15 +442,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. '

octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py

@@ -291,8 +291,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'

octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py

@@ -301,8 +301,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'

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.