Merge pull request #763 from openshift/master

Merge master into prod.

2 files changed, 38 insertions, 0 deletions

diff --git a/roles/rhel_subscribe/tasks/enterprise.yml b/roles/rhel_subscribe/tasks/enterprise.yml
new file mode 100644
index 000000000..e9e6e4bd4
--- /dev/null
+++ b/roles/rhel_subscribe/tasks/enterprise.yml
@@ -0,0 +1,9 @@
+---
+- name: Disable all repositories
+  command: subscription-manager repos --disable="*"
+
+- name: Enable RHEL repositories
+  command: subscription-manager repos \
+               --enable="rhel-7-server-rpms" \
+               --enable="rhel-7-server-extras-rpms" \
+               --enable="rhel-7-server-ose-3.0-rpms"
diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml
new file mode 100644
index 000000000..8fb2fc042
--- /dev/null
+++ b/roles/rhel_subscribe/tasks/main.yml
@@ -0,0 +1,29 @@
+---
+# TODO: Enhance redhat_subscription module
+#       to make it able to attach to a pool
+#       to make it able to enable repositories
+
+- set_fact:
+    rhel_subscription_user: "{{ lookup('oo_option', 'rhel_subscription_user') | default(rhsub_user, True) | default(omit, True) }}"
+    rhel_subscription_pass: "{{ lookup('oo_option', 'rhel_subscription_pass') | default(rhsub_pass, True) | default(omit, True) }}"
+
+- fail:
+    msg: "This role is only supported for Red Hat hosts"
+  when: ansible_distribution != 'RedHat'
+
+- fail:
+    msg: Either rsub_user or the rhel_subscription_user env variable are required for this role.
+  when: rhel_subscription_user is not defined
+
+- fail:
+    msg: Either rsub_pass or the rhel_subscription_pass env variable are required for this role.
+  when: rhel_subscription_pass is not defined
+
+- name: RedHat subscriptions
+  redhat_subscription:
+    username: "{{ rhel_subscription_user }}"
+    password: "{{ rhel_subscription_pass }}"
+    autosubscribe: yes
+
+- include: enterprise.yml
+  when: deployment_type == 'enterprise'