diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-09-26 13:53:32 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-09-26 15:36:06 -0400 |
| commit | 5964a9b34b1e68a2a965ffd1689be3eb37ba3570 (patch) | |
| tree | f97502b662795d7238674efa3113bf2d8358ef2a /roles/openshift_repos/tasks/main.yaml | |
| parent | 4ac743b8fd26e02af6e230af2cbbe82dd2d4617a (diff) | |
| download | openshift-5964a9b34b1e68a2a965ffd1689be3eb37ba3570.tar.gz openshift-5964a9b34b1e68a2a965ffd1689be3eb37ba3570.tar.bz2 openshift-5964a9b34b1e68a2a965ffd1689be3eb37ba3570.tar.xz openshift-5964a9b34b1e68a2a965ffd1689be3eb37ba3570.zip | |
Fix origin repo deployment
Currently, origin deployments place a repo on nodes and
masters named centos-openshift-origin. At some point,
the maintainers of centos-openshift-origin migrated
previous releases of openshift to their own respective
repositories.
This commit provides the correct repositories for
centos-openshift-origin based on the variable openshift_release,
defaulting to the latest release reposititory (unversioned).
Fixes: https://github.com/openshift/openshift-ansible/issues/5404
Diffstat (limited to 'roles/openshift_repos/tasks/main.yaml')
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index f972c0fd9..d41245093 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -30,30 +30,13 @@ - when: r_openshift_repos_has_run is not defined block: - # Note: OpenShift repositories under CentOS may be shipped through the - # "centos-release-openshift-origin" package which configures the repository. - # This task matches the file names provided by the package so that they are - # not installed twice in different files and remains idempotent. - - name: Configure origin repositories and gpg keys if needed - copy: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - with_items: - - src: origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS - dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS - - src: origin/repos/openshift-ansible-centos-paas-sig.repo - dest: /etc/yum.repos.d/CentOS-OpenShift-Origin.repo - notify: refresh cache + - include: centos_repos.yml when: - ansible_os_family == "RedHat" - ansible_distribution != "Fedora" - openshift_deployment_type == 'origin' - openshift_enable_origin_repo | default(true) | bool - - name: Enable centos-openshift-origin-testing repository - command: yum-config-manager --enable centos-openshift-origin-testing - when: openshift_repos_enable_testing | bool - - name: Ensure clean repo cache in the event repos have been changed manually debug: msg: "First run of openshift_repos" |