From 3db5216866ca67e204b14f9f0e314485eecd5647 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 26 May 2016 17:08:01 -0400
Subject: switch to using sig release packages

---
 .../files/origin/repos/centos-origin.repo              |  5 -----
 roles/openshift_repos/tasks/centos_sig.yaml            |  6 ++++++
 roles/openshift_repos/tasks/main.yaml                  | 18 ++++++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 roles/openshift_repos/files/origin/repos/centos-origin.repo
 create mode 100644 roles/openshift_repos/tasks/centos_sig.yaml

(limited to 'roles/openshift_repos')

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'
-- 
cgit v1.2.3