From dba48a053190ec67a7f957120561a677d246bcd5 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 26 Nov 2018 17:49:38 -0500
Subject: [PATCH] sat6: pull & deploy katello certs

For a node to communicate correctly with Katello, it needs the right SSL
certificates in place, and facts configured in RHSM.

It is provided by katello-ca-consumer-latest.noarch.rpm with
katello-rhsm-consumer script.

This patch installs the rpm and runs the script.

Change-Id: I180eb65a01832da76d5c433d9b13f8e410e24d04
Closes-Bug: #1805249
---
 tasks/satellite-6.yml | 29 +++++++++++++----------------
 vars/main.yml         |  4 ----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/tasks/satellite-6.yml b/tasks/satellite-6.yml
index f3adeee..bdb57d0 100644
--- a/tasks/satellite-6.yml
+++ b/tasks/satellite-6.yml
@@ -20,14 +20,6 @@
         that:
           - packages['subscription-manager'][0]['version'] is version_compare('1.10', '>=')
 
-- name: SATELLITE 6 | Set RHSM facts
-  copy:
-    content: "{{ rhsm_facts | to_json }}\n"
-    dest: /etc/rhsm/facts/katello.facts
-  vars:
-    rhsm_facts:
-      network.hostname-override: "{{ ansible_facts.fqdn }}"
-
 - name: Configure yum plugins
   ini_file:
     path: /etc/yum/pluginconf.d/{{ item.file }}
@@ -36,11 +28,16 @@
     value: "{{ item.value }}"
   loop: "{{ rhsm_yum_plugins }}"
 
-- name: SATELLITE 6 | Install CA certificates
-  copy:
-    content: "{{ rhsm_katello_ca }}\n"
-    dest: /etc/rhsm/ca/{{ item }}
-    owner: root
-    group: root
-    mode: 0644
-  loop: "{{ rhsm_ca_files }}"
+- name: SATELLITE 6 | Install katello-ca-consumer
+  yum:
+    name: "{{ rhsm_satellite_url }}/pub/katello-ca-consumer-latest.noarch.rpm"
+    state: present
+    validate_certs: no
+    disable_gpg_check: yes
+  register: katello_rpm
+
+# This script is provided by katello-ca-consumer and takes care of deploying
+# the katello certificates and prepare the config in RHSM.
+- name: SATELLITE 6 | Execute katello-rhsm-consumer
+  shell: katello-rhsm-consumer
+  when: katello_rpm.changed
diff --git a/vars/main.yml b/vars/main.yml
index 994cc8f..606205b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -8,7 +8,3 @@ rhsm_yum_plugins:
   - file: subscription-manager.conf
     option: enabled
     value: 1
-
-rhsm_ca_files:
-  - katello-server-ca.pem
-  - katello-default-ca.pem