3 files changed, 68 insertions, 1 deletions
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 5e7bde1e1..911005bb6 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -10,7 +10,7 @@
   - name: Ensure libselinux-python is installed
     package: name=libselinux-python state=present
     register: result
-    until: result | success
+    until: result is succeeded
 
   - name: Remove openshift_additional.repo file
     file:
@@ -37,6 +37,13 @@
   - when: r_openshift_repos_has_run is not defined
     block:
 
+    - include_tasks: rhel_repos.yml
+      when:
+      - ansible_distribution == 'RedHat'
+      - openshift_deployment_type == 'openshift-enterprise'
+      - rhsub_user is defined
+      - rhsub_pass is defined
+
     - include_tasks: centos_repos.yml
       when:
       - ansible_os_family == "RedHat"
diff --git a/roles/openshift_repos/tasks/rhel_repos.yml b/roles/openshift_repos/tasks/rhel_repos.yml
new file mode 100644
index 000000000..8d16629cc
--- /dev/null
+++ b/roles/openshift_repos/tasks/rhel_repos.yml
@@ -0,0 +1,33 @@
+---
+- name: Ensure RHEL rhui repositories are disabled
+  command: bash -c "yum -q --noplugins repolist | grep -v 'repo id' | grep 'rhui'"
+  register: repo_rhui
+  changed_when: "repo_rhui.rc != 1"
+  failed_when: repo_rhui.rc == 11
+
+- name: Disable RHEL rhui repositories
+  command: yum-config-manager \
+    --disable 'rhui-REGION-client-config-server-7' \
+    --disable 'rhui-REGION-rhel-server-rh-common' \
+    --disable 'rhui-REGION-rhel-server-releases'
+  when: repo_rhui.changed
+
+- name: Ensure RHEL repositories are enabled
+  command: bash -c "yum -q --noplugins repolist | grep -v 'repo id' | grep 'Red Hat' | wc -l"
+  register: repo_rhel
+  changed_when: "'4' not in repo_rhel.stdout"
+  failed_when: repo_rhel.rc == 11
+
+- name: Disable all repositories
+  command: bash -c "subscription-manager repos --disable='*'"
+  when: repo_rhel.changed
+
+- name: Enable RHEL repositories
+  command: subscription-manager repos \
+               --enable="rhel-7-server-rpms" \
+               --enable="rhel-7-server-extras-rpms" \
+               --enable="rhel-7-server-ose-{{ (openshift_release | default('')).split('.')[0:2] | join('.') }}-rpms" \
+               --enable="rhel-7-fast-datapath-rpms"
+  register: subscribe_repos
+  until: subscribe_repos | succeeded
+  when: repo_rhel.changed
diff --git a/roles/openshift_repos/templates/CentOS-OpenShift-Origin37.repo.j2 b/roles/openshift_repos/templates/CentOS-OpenShift-Origin37.repo.j2
new file mode 100644
index 000000000..db214af2c
--- /dev/null
+++ b/roles/openshift_repos/templates/CentOS-OpenShift-Origin37.repo.j2
@@ -0,0 +1,27 @@
+[centos-openshift-origin37]
+name=CentOS OpenShift Origin
+baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin37/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
+
+[centos-openshift-origin37-testing]
+name=CentOS OpenShift Origin Testing
+baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin37/
+enabled={{ 1 if openshift_repos_enable_testing else 0 }}
+gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
+
+[centos-openshift-origin37-debuginfo]
+name=CentOS OpenShift Origin DebugInfo
+baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
+
+[centos-openshift-origin37-source]
+name=CentOS OpenShift Origin Source
+baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin37/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS