summaryrefslogtreecommitdiffstats
path: root/roles/openshift_repos
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-24 09:04:59 -0400
committerGitHub <noreply@github.com>2017-07-24 09:04:59 -0400
commitac8f77887acae94a789f4b8fdc1f3f18a4446024 (patch)
tree95d0b2d23ab8bd2bab0ee11658a0f54932025953 /roles/openshift_repos
parenta095a161737637aa69fe88a1bf4a4bfae6718330 (diff)
parentb48887efc53b3757c6f179f1bfef2459b954a957 (diff)
downloadopenshift-ac8f77887acae94a789f4b8fdc1f3f18a4446024.tar.gz
openshift-ac8f77887acae94a789f4b8fdc1f3f18a4446024.tar.bz2
openshift-ac8f77887acae94a789f4b8fdc1f3f18a4446024.tar.xz
openshift-ac8f77887acae94a789f4b8fdc1f3f18a4446024.zip
Merge pull request #4307 from dmsimard/openshift-testing
Support enabling the centos-openshift-origin-testing repository
Diffstat (limited to 'roles/openshift_repos')
-rw-r--r--roles/openshift_repos/defaults/main.yaml1
-rw-r--r--roles/openshift_repos/tasks/main.yaml6
2 files changed, 6 insertions, 1 deletions
diff --git a/roles/openshift_repos/defaults/main.yaml b/roles/openshift_repos/defaults/main.yaml
index 7c5a14cd7..44f34ea7b 100644
--- a/roles/openshift_repos/defaults/main.yaml
+++ b/roles/openshift_repos/defaults/main.yaml
@@ -1,2 +1,3 @@
---
openshift_additional_repos: {}
+openshift_repos_enable_testing: false
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 8f8550e2d..7458db87e 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -33,7 +33,7 @@
# "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 gpg keys if needed
+ - name: Configure origin repositories and gpg keys if needed
copy:
src: "{{ item.src }}"
dest: "{{ item.dest }}"
@@ -49,6 +49,10 @@
- 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"