diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
| commit | 7480a0e06a9a1da029c6564e1e4d7ef60131e6e2 (patch) | |
| tree | 731b1c213bed675608c6e76452a0d4ed415f4416 /roles/openshift_repos/tasks | |
| parent | c1728c8847177988e4532b9c9c777e1a23223410 (diff) | |
| parent | 6ec757e4449fbc59f509f980bd9423bdb35412eb (diff) | |
| download | openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.gz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.bz2 openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.xz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.zip | |
Merge branch 'aoi-32-up' into upgrade33
Diffstat (limited to 'roles/openshift_repos/tasks')
| -rw-r--r-- | roles/openshift_repos/tasks/centos_sig.yaml | 14 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/roles/openshift_repos/tasks/centos_sig.yaml b/roles/openshift_repos/tasks/centos_sig.yaml index 62cbef5db..60640d8a9 100644 --- a/roles/openshift_repos/tasks/centos_sig.yaml +++ b/roles/openshift_repos/tasks/centos_sig.yaml @@ -1,6 +1,20 @@ --- +- name: Install CentOS OpenShift Origin Repo on RHEL + copy: + src: rhel-origin/repos/CentOS-OpenShift-Origin.repo + dest: /etc/yum.repos.d/CentOS-OpenShift-Origin.repo + when: ansible_distribution != 'CentOS' + +- name: Install CentOS extras gpg key for RHEL + copy: + src: rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS + dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS + mode: 0644 + when: ansible_distribution != 'CentOS' + - name: Install the CentOS PaaS SIG release packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" with_items: - centos-release-paas-common - centos-release-openshift-origin + when: ansible_distribution == 'CentOS' diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index f0b6ed7cb..32d66132e 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -81,4 +81,4 @@ - name: Configure the CentOS PaaS SIG repos if needed include: centos_sig.yaml - when: not openshift.common.is_containerized | bool and deployment_type == 'origin' and ansible_distribution == 'CentOS' + when: not openshift.common.is_containerized | bool and deployment_type == 'origin' and ansible_distribution != 'Fedora' |