move Red Hat entitlements into "common" role

Prior to this commit, entitling a system with Red Hat was a part of the
testnode role.

Move the Red Hat entitlement tasks into a new "common" role so that it
can apply to other systems besides testnodes.

This will allow us to register other systems to consume updates from Red
Hat's CDN.

Also, switch the "when" clause to evalute "ansible_distribution" instead
of "ansible_os_family". Prior to this change, Ansible would include
setup-redhat.yml on RHEL, Fedora and CentOS. The ansible_os_family fact
was overly-broad there, because we do not want to run
subscription-manager on Fedora and CentOS.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
new file mode 100644 (file)
index 0000000..313fd69
--- /dev/null
+++ b/roles/common/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: secrets

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
new file mode 100644 (file)
index 0000000..8b11d70
--- /dev/null
+++ b/roles/common/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+# configure Red Hat entitlements with subscription-manager
+- include: rhel-entitlements.yml
+  when: ansible_distribution == 'RedHat'
+  tags:
+    - entitlements

diff --git a/roles/common/tasks/rhel-entitlements.yml b/roles/common/tasks/rhel-entitlements.yml
new file mode 100644 (file)
index 0000000..7a8a756
--- /dev/null
+++ b/roles/common/tasks/rhel-entitlements.yml
@@ -0,0 +1,22 @@
+---
+# Register a RHEL-based system with subscription-manager.
+
+- name: Include Red Hat encrypted variables.
+  include_vars: "{{ secrets_path | mandatory }}/entitlements.yml"
+  no_log: true
+  tags:
+    - vars
+
+- name: Determine if node is registered with subscription-manager.
+  command: subscription-manager identity
+  register: subscription
+  ignore_errors: true
+  changed_when: false
+  no_log: true
+
+- name: Register with subscription-manager.
+  command: subscription-manager register
+           --activationkey={{ subscription_manager_activationkey }}
+           --org={{ subscription_manager_org }}
+  no_log: true
+  when: subscription.rc != 0

diff --git a/roles/testnode/tasks/redhat/entitlements.yml b/roles/testnode/tasks/redhat/entitlements.yml
deleted file mode 100644 (file)
index 44d5032..0000000
--- a/roles/testnode/tasks/redhat/entitlements.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Include Red Hat encrypted variables.
-  include_vars: "{{ secrets_path | mandatory }}/entitlements.yml"
-  no_log: true
-  tags:
-    - vars
-
-- name: Determine if node is registered with subscription-manager.
-  command: subscription-manager identity
-  register: subscription 
-  ignore_errors: true
-  changed_when: false
-  no_log: true
-
-- name: Register with subscription-manager.
-  command: subscription-manager register
-           --activationkey={{ subscription_manager_activationkey }}
-           --org={{ subscription_manager_org }}
-  no_log: true
-  when: subscription.rc != 0

diff --git a/roles/testnode/tasks/setup-redhat.yml b/roles/testnode/tasks/setup-redhat.yml
index 0f49c1eb9816ff6ce3f3179dc9325b8097977806..e37488d00cfdcfb5ce6370dc0f594f7e23333976 100644 (file)
--- a/roles/testnode/tasks/setup-redhat.yml
+++ b/roles/testnode/tasks/setup-redhat.yml
@@ -1,11 +1,5 @@
 ---
 
-- name: Register with subscription-manager.
-  include: redhat/entitlements.yml
-  tags:
-    - entitlements
-
-
 - name: Include rhel 7.0 specific tasks.
   include: redhat/rhel_7.0.yml
   when: ansible_distribution_version == "7.0"

diff --git a/testnodes.yml b/testnodes.yml
index 0b4f6c583dd3cc45fd3c55c562bb58df9fc3b033..0c93be257846815310fbfbd1a6732b0ef6d8f30a 100644 (file)
--- a/testnodes.yml
+++ b/testnodes.yml
@@ -1,4 +1,5 @@
 ---
 - hosts: testnodes
   roles:
+    - common
     - testnode