From 4cbf70dd5e931285973ab230e65ba3678fa87994 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Thu, 4 Feb 2021 08:56:22 +0100
Subject: [PATCH] octavia: Configure SSH key to allow debugging of Amphorae
 (#495)

---
 zaza/openstack/charm_tests/octavia/setup.py | 50 +++++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/zaza/openstack/charm_tests/octavia/setup.py b/zaza/openstack/charm_tests/octavia/setup.py
index 677c368..4b09aa0 100644
--- a/zaza/openstack/charm_tests/octavia/setup.py
+++ b/zaza/openstack/charm_tests/octavia/setup.py
@@ -25,6 +25,9 @@ import zaza.openstack.charm_tests.glance.setup as glance_setup
 import zaza.openstack.utilities.openstack as openstack
 import zaza.openstack.configure.guest
 
+import zaza.openstack.charm_tests.nova.setup as nova_setup
+import zaza.openstack.charm_tests.nova.utils as nova_utils
+
 
 def ensure_lts_images():
     """Ensure that bionic and focal images are available for the tests."""
@@ -51,13 +54,32 @@ def add_amphora_image(image_url=None):
 
 
 def configure_octavia():
-    """Do mandatory post deployment configuration of Octavia."""
-    # Tell Octavia charm it is safe to create cloud resources
-    logging.info('Running `configure-resources` action on Octavia leader unit')
-    zaza.model.run_action_on_leader(
-        'octavia',
-        'configure-resources',
-        action_params={})
+    """Do post deployment configuration and initialization of Octavia.
+
+    Certificates for the private Octavia worker <-> Amphorae communication must
+    be generated and set trough charm configuration.
+
+    The optional SSH configuration options are set to enable debug and log
+    collection from Amphorae, we will use the same keypair as Zaza uses for
+    instance creation.
+
+    The `configure-resources` action must be run to have the charm create
+    in-cloud resources such as management network and associated ports and
+    security groups.
+    """
+    # Set up Nova client to create/retrieve keypair for Amphora debug purposes.
+    #
+    # We reuse the Nova setup code for this and in most cases the test
+    # declaration will already defined that the Nova manage_ssh_key setup
+    # helper to run before we get here. Re-run here to make sure this setup
+    # function can be used separately, manage_ssh_key is idempotent.
+    keystone_session = openstack.get_overcloud_keystone_session()
+    nova_client = openstack.get_nova_session_client(
+        keystone_session)
+    nova_setup.manage_ssh_key(nova_client)
+    ssh_public_key = openstack.get_public_key(
+        nova_client, nova_utils.KEYPAIR_NAME)
+
     # Generate certificates for controller/load balancer instance communication
     (issuing_cakey, issuing_cacert) = cert.generate_cert(
         'OSCI Zaza Issuer',
@@ -71,7 +93,7 @@ def configure_octavia():
         issuer_name='OSCI Zaza Octavia Controller',
         signing_key=controller_cakey)
     controller_bundle = controller_cert + controller_key
-    cert_config = {
+    charm_config = {
         'lb-mgmt-issuing-cacert': base64.b64encode(
             issuing_cacert).decode('utf-8'),
         'lb-mgmt-issuing-ca-private-key': base64.b64encode(
@@ -81,6 +103,9 @@ def configure_octavia():
             controller_cacert).decode('utf-8'),
         'lb-mgmt-controller-cert': base64.b64encode(
             controller_bundle).decode('utf-8'),
+        'amp-ssh-key-name': 'octavia',
+        'amp-ssh-pub-key': base64.b64encode(
+            bytes(ssh_public_key, 'utf-8')).decode('utf-8'),
     }
     logging.info('Configuring certificates for mandatory Octavia '
                  'client/server authentication '
@@ -93,10 +118,17 @@ def configure_octavia():
 
     _singleton = zaza.openstack.charm_tests.test_utils.OpenStackBaseTest()
     _singleton.setUpClass(application_name='octavia')
-    with _singleton.config_change(cert_config, cert_config):
+    with _singleton.config_change(charm_config, charm_config):
         # wait for configuration to be applied then return
         pass
 
+    # Tell Octavia charm it is safe to create cloud resources
+    logging.info('Running `configure-resources` action on Octavia leader unit')
+    zaza.model.run_action_on_leader(
+        'octavia',
+        'configure-resources',
+        action_params={})
+
 
 def centralized_fip_network():
     """Create network with centralized router for connecting lb and fips.