diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-14 12:39:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 12:39:25 -0500 |
| commit | 67db90531b25cae235eaa093d3d55a20c08d482d (patch) | |
| tree | 0748e5c4b2899aab078ce775666651adfe1972a0 /roles/openshift_repos/tasks | |
| parent | a59820e01fd49fb1d50867571574fb20f3ce2692 (diff) | |
| parent | 2fb03f8078fc8810544b099f4794d147c6cbcde8 (diff) | |
| download | openshift-67db90531b25cae235eaa093d3d55a20c08d482d.tar.gz openshift-67db90531b25cae235eaa093d3d55a20c08d482d.tar.bz2 openshift-67db90531b25cae235eaa093d3d55a20c08d482d.tar.xz openshift-67db90531b25cae235eaa093d3d55a20c08d482d.zip | |
Merge pull request #6404 from mazzystr/stablize_rhsm
Commit to stabilize RHSM operations. This code is derived from contrib
Diffstat (limited to 'roles/openshift_repos/tasks')
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 7 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/rhel_repos.yml | 34 |
2 files changed, 41 insertions, 0 deletions
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 5e7bde1e1..83954eaf8 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -37,6 +37,13 @@ - when: r_openshift_repos_has_run is not defined block: + - include_tasks: rhel_repos.yml + when: + - ansible_distribution == 'RedHat' + - deployment_type == 'openshift-enterprise' + - (rhel_subscription_user or rhsub_user) is defined + - (rhel_subscription_password or 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..c384cbe9a --- /dev/null +++ b/roles/openshift_repos/tasks/rhel_repos.yml @@ -0,0 +1,34 @@ +--- +- 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: bash -c "yum-config-manager \ + --disable 'rhui-REGION-client-config-server-7' \ + --disable 'rhui-REGION-rhel-server-rh-common' \ + --disable 'rhui-REGION-rhel-server-releases' \ + --disable 'rhui-REGION-client-config-server-7'" + 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 |