From a83ed798a29918400ddb3e8c2a0143d78c621bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Cor=C3=A9?= <gucore@redhat.com>
Date: Thu, 12 Dec 2024 12:04:06 +0100
Subject: [PATCH] Remove deprecated ocpkey

this key should not be used anywhere by now
---
 .../roles/infra-aws-sandbox/defaults/main.yml   |  4 ----
 .../roles/infra-aws-sandbox/tasks/keypair.yml   | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/playbooks/roles/infra-aws-sandbox/defaults/main.yml b/playbooks/roles/infra-aws-sandbox/defaults/main.yml
index 5a741a1e..d271f0f5 100644
--- a/playbooks/roles/infra-aws-sandbox/defaults/main.yml
+++ b/playbooks/roles/infra-aws-sandbox/defaults/main.yml
@@ -31,9 +31,6 @@ ddns_server: ipaserver
 # yamllint disable-line rule:line-length
 opentlc_admin_backdoor: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvZvn+GL0wTOsAdh1ikIQoqj2Fw/RA6F14O347rgKdpkgOQpGQk1k2gM8wcla2Y1o0bPIzwlNy1oh5o9uNjZDMeDcEXWuXbu0cRBy4pVRhh8a8zAZfssnqoXHHLyPyHWpdTmgIhr0UIGYrzHrnySAnUcDp3gJuE46UEBtrlyv94cVvZf+EZUTaZ+2KjTRLoNryCn7vKoGHQBooYg1DeHLcLSRWEADUo+bP0y64+X/XTMZOAXbf8kTXocqAgfl/usbYdfLOgwU6zWuj8vxzAKuMEXS1AJSp5aeqRKlbbw40IkTmLoQIgJdb2Zt98BH/xHDe9xxhscUCfWeS37XLp75J
 
-# yamllint disable-line rule:line-length
-ocpkey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8c3m39CoyA3bbgQUui3MGlJOryfg98NwIj8UUOv+PCuTRiyNanZeirRnPzWBtPzrVXeqtfenJo1ehDt0SRoqlUvpE7IUgnJsM7XJaUmKiVJMI4WslgMQMsZQGol7n2h0jwvtXIQp44jTtX61G7HMIUoFjJNXCO5GCrj3w2SVAKMYcznKUXpVmrkjdiHTZHmDxArHKZ7Kew2jCNUMgEq+mcaINPovUybjD17rCiKJDV4JQvLFQH89BFTVkVBsc0+QAe9LoW6l0rMDSemTvFeHy7tD0qGxYehvnHreOH6Nn9j9iOlG0f4R9+M+8KaI3uqibjOhn/kOQLK/1mphg2NnJ
-
 ####################################
 # variable for RESET operation
 ####################################
@@ -101,7 +98,6 @@ aws_nuke_filters_default:
 
   EC2KeyPair:
     - opentlc_admin_backdoor
-    - ocpkey
 
   CloudFormationStack:
     - roles
diff --git a/playbooks/roles/infra-aws-sandbox/tasks/keypair.yml b/playbooks/roles/infra-aws-sandbox/tasks/keypair.yml
index ea821cbb..1c53e2e1 100644
--- a/playbooks/roles/infra-aws-sandbox/tasks/keypair.yml
+++ b/playbooks/roles/infra-aws-sandbox/tasks/keypair.yml
@@ -1,5 +1,4 @@
 ---
-# TODO: create a list of keys and loop over it instead of doing one by one
 - name: Import OPENTLC backdoor key
   ec2_key:
     name: opentlc_admin_backdoor
@@ -15,19 +14,3 @@
   retries: 5
   delay: "{{ 30|random(start=3, step=1) }}"
   until: r_import is succeeded
-
-- name: Import OPENTLC ocpkey
-  ec2_key:
-    name: ocpkey
-    region: "{{ _region }}"
-    key_material: "{{ ocpkey }}"
-    aws_access_key: "{{ assumed_role.sts_creds.access_key }}"
-    aws_secret_key: "{{ assumed_role.sts_creds.secret_key }}"
-    session_token: "{{ assumed_role.sts_creds.session_token }}"
-  loop: "{{ all_regions }}"
-  loop_control:
-    loop_var: _region
-  register: r_import2
-  retries: 5
-  delay: "{{ 30|random(start=3, step=1) }}"
-  until: r_import2 is succeeded