From 7e7243fe152b81ded38f1dca4770a1e053e40e04 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Thu, 25 Jul 2019 16:36:09 +0000
Subject: [PATCH] install-openshift: bump version to 3.11.0
This change install the latest 3.x version of openshift.
Change-Id: I941f8831a9ecdb930b7a0edd85f7f15a3b8d57e6
---
roles/deploy-openshift/tasks/main.yaml | 8 ++++++++
roles/install-openshift/defaults/main.yaml | 4 ++--
roles/install-openshift/tasks/main.yaml | 1 -
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/roles/deploy-openshift/tasks/main.yaml b/roles/deploy-openshift/tasks/main.yaml
index aa413644e..5506c880e 100644
--- a/roles/deploy-openshift/tasks/main.yaml
+++ b/roles/deploy-openshift/tasks/main.yaml
@@ -1,4 +1,12 @@
---
+- name: Authorize docker networks
+ shell: |
+ iptables -I INPUT -s 172.16.0.0/12 -j ACCEPT
+ iptables -I OUTPUT -d 172.16.0.0/12 -j ACCEPT
+ iptables -I FORWARD -s 172.16.0.0/12 -j ACCEPT
+ iptables -I FORWARD -d 172.16.0.0/12 -j ACCEPT
+ become: yes
+
- name: Deploy local openshift cluster
command: "oc cluster up --insecure-skip-tls-verify=true --public-hostname={{ ansible_hostname }}"
become: yes
diff --git a/roles/install-openshift/defaults/main.yaml b/roles/install-openshift/defaults/main.yaml
index 6f77c7535..09fa482a5 100644
--- a/roles/install-openshift/defaults/main.yaml
+++ b/roles/install-openshift/defaults/main.yaml
@@ -1,2 +1,2 @@
-origin_repo: centos-release-openshift-origin39
-origin_version: v3.9.0
+origin_repo: centos-release-openshift-origin311
+origin_version: v3.11.0
diff --git a/roles/install-openshift/tasks/main.yaml b/roles/install-openshift/tasks/main.yaml
index 3b5497d05..d897efa57 100644
--- a/roles/install-openshift/tasks/main.yaml
+++ b/roles/install-openshift/tasks/main.yaml
@@ -38,7 +38,6 @@
- origin-docker-registry
- origin-haproxy-router
- origin-deployer
- - origin-sti-builder
- origin-pod
- origin
become: yes