Merge "sat6: pull & deploy katello certs"

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
+- name: SATELLITE 6 | Install katello-ca-consumer
-  copy:
+  yum:
-    content: "{{ rhsm_katello_ca }}\n"
+    name: "{{ rhsm_satellite_url }}/pub/katello-ca-consumer-latest.noarch.rpm"
-    dest: /etc/rhsm/ca/{{ item }}
+    state: present
-    owner: root
+    validate_certs: no
-    group: root
+    disable_gpg_check: yes
-    mode: 0644
+  register: katello_rpm
-  loop: "{{ rhsm_ca_files }}"
+
+# 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

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