From 2c944e6cc872e71318e25f5e1dc1d30586cb5a78 Mon Sep 17 00:00:00 2001
From: willtome <willtome@gmail.com>
Date: Mon, 5 Jun 2023 09:34:18 -0400
Subject: [PATCH] implement rhc role

---
 collections/requirements.yml |  2 +-
 linux/ec2_register.yml       | 34 +++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/collections/requirements.yml b/collections/requirements.yml
index b92df16..242bee7 100644
--- a/collections/requirements.yml
+++ b/collections/requirements.yml
@@ -8,7 +8,7 @@ collections:
   - name: redhat.insights
     version: 1.0.7
   - name: redhat.rhel_system_roles
-    version: 1.20.0
+    version: 1.21.1
   - name: community.general
     version: 6.3.0
   - name: containers.podman
diff --git a/linux/ec2_register.yml b/linux/ec2_register.yml
index 789209d..5cb23a8 100644
--- a/linux/ec2_register.yml
+++ b/linux/ec2_register.yml
@@ -2,9 +2,12 @@
 - name: Register ec2 instance with subscription mangler
   hosts: "{{ _hosts | default(omit)  }}"
   become: true
+  vars:
+    registration_state: present
+    insights_state: present
 
   tasks:
-    - name: Check for vars
+    - name: Check for org_id and activation_key
       ansible.builtin.assert:
         that:
           - org_id is defined
@@ -56,18 +59,19 @@
         regexp: '^manage_repos'
         line: 'manage_repos = 1'
 
-    - name: Register subscription mangler
-      community.general.redhat_subscription:
-        state: present
-        activationkey: "{{ activation_key }}"
-        org_id: "{{ org_id }}"
-
-    - name: Configure Red Hat insights
-      ansible.builtin.import_role:
-        name: redhat.insights.insights_client
+    - name: Register with subscription mangler
+      ansible.builtin.include_role:
+        name: redhat.rhel_system_roles.rhc
       vars:
-        insights_display_name: "{{ inventory_hostname }}"
-        insights_tags:
-          env: "{{ env }}"
-          purpose: demo
-          group: "{{ insights_tag }}"
+        rhc_state: "{{ registration_state }}"
+        rhc_organization: "{{ org_id }}"
+        rhc_auth:
+          activation_keys:
+            keys:
+              - "{{ activation_key }}"
+        rhc_insights:
+          state: "{{ insights_state }}"
+          tags:
+            env: "{{ env }}"
+            purpose: demo
+            group: "{{ insights_tag }}"