From 830b2891f8628828bc4385ebafb71f4174f79a05 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 24 Nov 2015 10:32:53 -0500
Subject: 3.1 upgrade - use --api-version for patch commands
---
.../common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'playbooks')
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index eea147229..cc7367801 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -517,24 +517,29 @@
- _default_router.rc == 0
- "'false' in _scc.stdout"
command: >
- {{ oc_cmd }} patch scc/privileged -p '{"allowHostPorts":true,"allowHostNetwork":true}' --loglevel=9
+ {{ oc_cmd }} patch scc/privileged -p
+ '{"allowHostPorts":true,"allowHostNetwork":true}' --loglevel=9
+ --api-version=v1
- name: Update deployment config to 1.0.4/3.0.1 spec
when: _default_router.rc == 0
command: >
{{ oc_cmd }} patch dc/router -p
'{"spec":{"strategy":{"rollingParams":{"updatePercent":-10},"spec":{"serviceAccount":"router","serviceAccountName":"router"}}}}'
+ --api-version=v1
- name: Switch to hostNetwork=true
when: _default_router.rc == 0
command: >
{{ oc_cmd }} patch dc/router -p '{"spec":{"template":{"spec":{"hostNetwork":true}}}}'
+ --api-version=v1
- name: Update router image to current version
when: _default_router.rc == 0
command: >
{{ oc_cmd }} patch dc/router -p
'{"spec":{"template":{"spec":{"containers":[{"name":"router","image":"{{ router_image }}"}]}}}}'
+ --api-version=v1
- name: Check for default registry
command: >
@@ -548,3 +553,4 @@
command: >
{{ oc_cmd }} patch dc/docker-registry -p
'{"spec":{"template":{"spec":{"containers":[{"name":"registry","image":"{{ registry_image }}"}]}}}}'
+ --api-version=v1
--
cgit v1.2.3
From a2dc715e54f47fa2abbac58d9d04565837bc6e56 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 24 Nov 2015 10:49:44 -0500
Subject: Set api version for oc commands
---
playbooks/common/openshift-master/config.yml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'playbooks')
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 43e7836b3..f382494bd 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -353,11 +353,16 @@
- role: openshift_cluster_metrics
when: openshift.common.use_cluster_metrics | bool
+ # TODO: Setting the cluster dns ip should be pushed into openshift-facts
- name: Determine cluster dns ip
hosts: oo_first_master
tasks:
- name: Get master service ip
- command: "{{ openshift.common.client_binary }} -n default --config={{ openshift.common.config_base }}/master/admin.kubeconfig get -o template svc kubernetes --template=\\{\\{.spec.clusterIP\\}\\}"
+ command: >
+ {{ openshift.common.client_binary }} -n default
+ --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+ get -o template svc kubernetes --template=\\{\\{.spec.clusterIP\\}\\}
+ --output-version=v1
register: master_service_ip_output
when: openshift.common.version_greater_than_3_1_or_1_1 | bool
- set_fact:
--
cgit v1.2.3
From 526038fa15a6c02661f2315278c086477157b87f Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 24 Nov 2015 14:14:28 -0500
Subject: remove debug logging from scc/privileged patch command
---
playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'playbooks')
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index cc7367801..00ebf4ce6 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -518,8 +518,7 @@
- "'false' in _scc.stdout"
command: >
{{ oc_cmd }} patch scc/privileged -p
- '{"allowHostPorts":true,"allowHostNetwork":true}' --loglevel=9
- --api-version=v1
+ '{"allowHostPorts":true,"allowHostNetwork":true}' --api-version=v1
- name: Update deployment config to 1.0.4/3.0.1 spec
when: _default_router.rc == 0
--
cgit v1.2.3