summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicky Elrod <codeblock@fedoraproject.org>2017-09-15 19:18:32 +0000
committerRicky Elrod <codeblock@fedoraproject.org>2017-09-15 19:21:29 +0000
commitce95ba5fd6eea83c7475157e26971c975bd32a3b (patch)
treefbda91d0a4c2d4d0f7d18cc0226f2afea98bbc28
parentbf1b02c9fc450cae9323c12d09f172794adde5ff (diff)
downloadansible-ce95ba5fd6eea83c7475157e26971c975bd32a3b.tar.gz
ansible-ce95ba5fd6eea83c7475157e26971c975bd32a3b.tar.xz
ansible-ce95ba5fd6eea83c7475157e26971c975bd32a3b.zip
Add openshift 3.6 repo in stg
Signed-off-by: Ricky Elrod <codeblock@fedoraproject.org>
-rw-r--r--files/openshift/openshift.repo7
-rw-r--r--playbooks/groups/os-cluster.yml4
2 files changed, 9 insertions, 2 deletions
diff --git a/files/openshift/openshift.repo b/files/openshift/openshift.repo
index b4dbadbd9..001ce9001 100644
--- a/files/openshift/openshift.repo
+++ b/files/openshift/openshift.repo
@@ -7,3 +7,10 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
name = rhel7 openshift 3.5 $basearch
baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.5-rpms/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
+{% if env == 'staging' %}
+[rhel7-openshift-3.6]
+name = rhel7 openshift 3.6 $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.6-rpms/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+{% endif %}
diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml
index 9dc2634d2..e75ea992d 100644
--- a/playbooks/groups/os-cluster.yml
+++ b/playbooks/groups/os-cluster.yml
@@ -24,8 +24,8 @@
when: env != "staging" and 'os-control' not in group_names }
tasks:
- - name: put openshift 3.4 repo on os- systems
- copy: src="{{ files }}/openshift/openshift.repo" dest="/etc/yum.repos.d/openshift.repo"
+ - name: put openshift repo on os- systems
+ template: src="{{ files }}/openshift/openshift.repo" dest="/etc/yum.repos.d/openshift.repo"
tags:
- config
- packages