diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-31 13:55:22 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-31 13:55:22 -0400 |
| commit | 51f0e95bb65ab8f59f683226afefe381e430aae4 (patch) | |
| tree | 2ed0e39c28826c6b82fde859ee125e6a7c7b9f49 | |
| parent | 444127b4ee58b8e7314af583e3f0d70f3522d543 (diff) | |
| parent | 3db5216866ca67e204b14f9f0e314485eecd5647 (diff) | |
| download | openshift-51f0e95bb65ab8f59f683226afefe381e430aae4.tar.gz openshift-51f0e95bb65ab8f59f683226afefe381e430aae4.tar.bz2 openshift-51f0e95bb65ab8f59f683226afefe381e430aae4.tar.xz openshift-51f0e95bb65ab8f59f683226afefe381e430aae4.zip | |
Merge pull request #1685 from detiber/centos_sig
Switch to using CentOS SIG repos for Origin installs
| -rw-r--r-- | roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo (renamed from roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo) | 0 | ||||
| -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, 4 deletions
diff --git a/roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo b/roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo index 0b21e0a65..0b21e0a65 100644 --- a/roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo +++ b/roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo 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' |