From 1f3e2a9f59e83dc3f0fcbecf096a7e7b40d36ed7 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Wed, 28 Feb 2018 23:46:55 +0100
Subject: First running prototype

---
 anslib/ansible-ghetto-json                         |  1 +
 anslib/openshift-ansible                           |  2 +-
 .../openshift-ds-allow-upgrade-to-371.patch        | 45 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 160000 anslib/ansible-ghetto-json
 create mode 100644 anslib/patches/openshift-ds-allow-upgrade-to-371.patch

(limited to 'anslib')

diff --git a/anslib/ansible-ghetto-json b/anslib/ansible-ghetto-json
new file mode 160000
index 0000000..a09b9fc
--- /dev/null
+++ b/anslib/ansible-ghetto-json
@@ -0,0 +1 @@
+Subproject commit a09b9fc089cada6172f9401ba4eaf48f89452c67
diff --git a/anslib/openshift-ansible b/anslib/openshift-ansible
index ec3bc59..a462739 160000
--- a/anslib/openshift-ansible
+++ b/anslib/openshift-ansible
@@ -1 +1 @@
-Subproject commit ec3bc59ab20c4c21b7cfd27065c1a9b811bd9518
+Subproject commit a46273949c39d6bd20ee65eb89aa96a73ffe9aef
diff --git a/anslib/patches/openshift-ds-allow-upgrade-to-371.patch b/anslib/patches/openshift-ds-allow-upgrade-to-371.patch
new file mode 100644
index 0000000..2bae14e
--- /dev/null
+++ b/anslib/patches/openshift-ds-allow-upgrade-to-371.patch
@@ -0,0 +1,45 @@
+diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
+index cc2ec27..6c4ccf8 100644
+--- a/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
++++ b/playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml
+@@ -12,7 +12,7 @@
+   - pre_upgrade
+   tasks:
+   - set_fact:
+-      openshift_upgrade_target: '3.7'
++      openshift_upgrade_target: '3.7.1'
+       openshift_upgrade_min: '3.6'
+ 
+ - import_playbook: ../pre/config.yml
+diff --git a/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2 b/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2
+new file mode 100644
+index 0000000..3118c7c
+--- /dev/null
++++ b/roles/openshift_repos/templates/CentOS-OpenShift-Origin371.repo.j2
+@@ -0,0 +1,26 @@
++[centos-openshift-origin371]
++name=CentOS OpenShift Origin
++baseurl=http://ufo.kit.edu/ands/repos/openshift74/
++enabled=1
++gpgcheck=0
++
++[centos-openshift-origin37-testing]
++name=CentOS OpenShift Origin Testing
++baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin37/
++enabled={{ 1 if openshift_repos_enable_testing else 0 }}
++gpgcheck=0
++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
++
++[centos-openshift-origin37-debuginfo]
++name=CentOS OpenShift Origin DebugInfo
++baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/
++enabled=0
++gpgcheck=1
++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
++
++[centos-openshift-origin37-source]
++name=CentOS OpenShift Origin Source
++baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin37/
++enabled=0
++gpgcheck=1
++gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
-- 
cgit v1.2.1