From 4a631dd20152d12d62fcb4c6740bb1deeb514b96 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 20 Jun 2024 09:52:50 -0700
Subject: [PATCH] Cleanup leftover inmotion configs

This removes leftover inmotion clouds.yaml related configs from our
configuration management. We remove the hardcoded cert (since the old
cloud used a self signed cert) and various ansible vars used in testing.
Note we keep the ansible task to write out special cloud certs so that
we don't have to reinvent this code in the future / remember we had it
once and unrevert it, but we feed that task an empty list making it a
noop currently.

Change-Id: I2a6fdf06879023ab6ee65437a592d55a8c0eb371
---
 .../files/inmotion_cacert.pem                 | 20 -------------------
 .../configure-openstacksdk/tasks/main.yaml    |  3 +--
 .../group_vars/control-plane-clouds.yaml.j2   |  8 +-------
 .../templates/group_vars/nodepool.yaml.j2     |  3 ---
 testinfra/test_bridge.py                      |  7 -------
 5 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem

diff --git a/playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem b/playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem
deleted file mode 100644
index 0cf2ed3f16..0000000000
--- a/playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIURsemqD9ImPMU6VhJSiN1CyGifxAwDQYJKoZIhvcNAQEL
-BQAwUjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5DMQwwCgYDVQQHDANSVFAxDjAM
-BgNVBAoMBWtvbGxhMRgwFgYDVQQDDA8xNzMuMjMxLjI1NS4yMjgwHhcNMjEwNDIx
-MTUyMTUyWhcNMzEwNDE5MTUyMTUyWjBSMQswCQYDVQQGEwJVUzELMAkGA1UECAwC
-TkMxDDAKBgNVBAcMA1JUUDEOMAwGA1UECgwFa29sbGExGDAWBgNVBAMMDzE3My4y
-MzEuMjU1LjIyODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPNdzpCV
-ofCLK2bmn0ALtaz8VzihZJvLqxOlDaN12ufGiaL54gaWkbpis4jQPlFS3hkkjAvF
-RvR+0dWH5rjjG2uIdVksav0WxulOIR5G0ssv/1XlXl4heqcuYLCrZDNq5QONV4rx
-hzu3H1ZH5JyYc6ecDo9JfEauei5Xc0J3Et5IvvZzksD1BUq71Qhf/awH8Y/4KtRA
-9kN1kSRDJT9WBsAwaACQ3bOQACyVQzCj1TJt5Ne0zkMRNdzmAxk8dLgMkx2pkE97
-8RaPzgP0P/G8f4Wk0usSWC3b6t/8INQ+x3Pgw2ec7IUcj+hYr4bzZmaD/VRP0zFw
-pS3IxFZu4phqgzcCAwEAAaMTMBEwDwYDVR0RBAgwBocEref/5DANBgkqhkiG9w0B
-AQsFAAOCAQEAJLu91X1AUpkR2nBSi90eeccuProFzQP5+M+F8+xhCg9rvp9gEUkn
-QwwgQviyRJsj+YhOvCEtWPMMr4z70MNcXjuc52rkmiivo8kHGPLIlt50Qo9rzE/m
-DjGcbrfx03KzSZWNyVeGmG9frDD6BYWn/jDH0qnuS/ubcTIqbR8PnRO6FGaD83Lx
-rTCOeLCe/adGxjeW1B8aCmP2ck3CXX1a4oV6c8OfgfECZtqwqv+rTUGDprWJJyy8
-PJ35qM1X4araQeRbE6G7hZp/XOpKgHleHLTu1/t7dH+Em6hbxEJJkEO+dtd8t6Mp
-rySdEAvwAWyGisaAiI9cO26erQrgMVueag==
------END CERTIFICATE-----
diff --git a/playbooks/roles/configure-openstacksdk/tasks/main.yaml b/playbooks/roles/configure-openstacksdk/tasks/main.yaml
index f7b100f8bc..f9f3582325 100644
--- a/playbooks/roles/configure-openstacksdk/tasks/main.yaml
+++ b/playbooks/roles/configure-openstacksdk/tasks/main.yaml
@@ -13,8 +13,7 @@
     mode: 0640
     owner: '{{ openstacksdk_config_owner }}'
     src: '{{ item }}'
-  loop:
-    - inmotion_cacert.pem
+  loop: []
 
 - name: Install the clouds config file
   template:
diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
index d8fe34b931..4f280df4a1 100644
--- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2
@@ -50,15 +50,9 @@ clouds:
   opendevzuul_osuosl_username: user
   opendevzuul_osuosl_password: password
   opendevzuul_osuosl_project_id: project
-  opendevci_inmotion_username: user
-  opendevci_inmotion_password: password
-  opendevci_inmotion_project_id: project
-  opendevzuul_inmotion_username: user
-  opendevzuul_inmotion_password: password
-  opendevzuul_inmotion_project_id: project
   opendevci_openmetal_username: user
   opendevci_openmetal_password: password
   opendevci_openmetal_project_id: project
   opendevzuul_openmetal_username: user
   opendevzuul_openmetal_password: password
-  opendevzuul_openmetal_project_id: project
\ No newline at end of file
+  opendevzuul_openmetal_project_id: project
diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
index fc881d6d06..f62bf67cb9 100644
--- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2
@@ -49,9 +49,6 @@ nodepool_linaro_us_project: project
 nodepool_osuosl_username: user
 nodepool_osuosl_password: password
 nodepool_osuosl_project_id: project
-nodepool_inmotion_username: user
-nodepool_inmotion_password: password
-nodepool_inmotion_project_id: project
 nodepool_openmetal_username: user
 nodepool_openmetal_password: password
 nodepool_openmetal_project_id: project
diff --git a/testinfra/test_bridge.py b/testinfra/test_bridge.py
index 0f16ed4cc2..7aeb7dd482 100644
--- a/testinfra/test_bridge.py
+++ b/testinfra/test_bridge.py
@@ -38,13 +38,6 @@ def test_openstacksdk_config(host):
     assert f.mode == 0o750
     del f
 
-    f = host.file('/etc/openstack/inmotion_cacert.pem')
-    assert f.exists
-    assert f.is_file
-    assert f.user == 'root'
-    assert f.group == 'root'
-    assert f.mode == 0o640
-
 def test_root_authorized_keys(host):
     authorized_keys = host.file('/root/.ssh/authorized_keys')
     assert authorized_keys.exists