diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-26 17:08:01 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-26 17:08:01 -0400 |
| commit | 3db5216866ca67e204b14f9f0e314485eecd5647 (patch) | |
| tree | dd0c99aa6c5ccf83a0c6cab2c9a9f3aa33f729c3 /roles | |
| parent | 72421b3f6afd8a1e11ab0f3f05f62fdbb3e6cf18 (diff) | |
| download | openshift-3db5216866ca67e204b14f9f0e314485eecd5647.tar.gz openshift-3db5216866ca67e204b14f9f0e314485eecd5647.tar.bz2 openshift-3db5216866ca67e204b14f9f0e314485eecd5647.tar.xz openshift-3db5216866ca67e204b14f9f0e314485eecd5647.zip | |
switch to using sig release packages
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_repos/files/origin/repos/centos-origin.repo | 5 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/centos_sig.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 18 |
3 files changed, 20 insertions, 9 deletions
diff --git a/roles/openshift_repos/files/origin/repos/centos-origin.repo b/roles/openshift_repos/files/origin/repos/centos-origin.repo deleted file mode 100644 index 77c0c7c71..000000000 --- a/roles/openshift_repos/files/origin/repos/centos-origin.repo +++ /dev/null @@ -1,5 +0,0 @@ -[centos-openshift-origin] -name=CentOS OpenShift Origin -baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/ -enabled=1 -gpgcheck=0 diff --git a/roles/openshift_repos/tasks/centos_sig.yaml b/roles/openshift_repos/tasks/centos_sig.yaml new file mode 100644 index 000000000..62cbef5db --- /dev/null +++ b/roles/openshift_repos/tasks/centos_sig.yaml @@ -0,0 +1,6 @@ +--- +- 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 diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index af9fefec6..f0b6ed7cb 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -35,7 +35,7 @@ state: absent with_fileglob: - '*/repos/*' - when: not openshift.common.is_containerized | bool + when: not openshift.common.is_containerized | bool and not (item | search("/files/" ~ openshift_deployment_type ~ "/repos")) and (ansible_os_family == "RedHat" and ansible_distribution != "Fedora") notify: refresh cache @@ -52,14 +52,18 @@ notify: refresh cache - name: Configure gpg keys if needed - copy: src="{{ item }}" dest=/etc/pki/rpm-gpg/ + copy: + src: "{{ item }}" + dest: /etc/pki/rpm-gpg/ with_fileglob: - "{{ openshift_deployment_type }}/gpg_keys/*" notify: refresh cache when: not openshift.common.is_containerized | bool - name: Configure yum repositories RHEL/CentOS - copy: src="{{ item }}" dest=/etc/yum.repos.d/ + copy: + src: "{{ item }}" + dest: /etc/yum.repos.d/ with_fileglob: - "{{ openshift_deployment_type }}/repos/*" notify: refresh cache @@ -67,8 +71,14 @@ and not openshift.common.is_containerized | bool - name: Configure yum repositories Fedora - copy: src="{{ item }}" dest=/etc/yum.repos.d/ + copy: + src: "{{ item }}" + dest: /etc/yum.repos.d/ with_fileglob: - "fedora-{{ openshift_deployment_type }}/repos/*" notify: refresh cache when: (ansible_distribution == "Fedora") and not openshift.common.is_containerized | bool + +- 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' |