summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-19 15:18:02 -0400
committerGitHub <noreply@github.com>2017-06-19 15:18:02 -0400
commitfabc141055b93d541701c82ce71d31a0a1d1bb6f (patch)
tree519e0c04df4dd5bebab8ab6dc70b6d13ae77e014 /roles/openshift_master/tasks
parent326d8e530db5f0cfcbc1a77451150699063e900e (diff)
parentd309657b40b71fba2c16aa663397da81e126a2fb (diff)
downloadopenshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.tar.gz
openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.tar.bz2
openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.tar.xz
openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.zip
Merge pull request #4486 from sdodson/etcdv3-clean-install
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml20
1 files changed, 0 insertions, 20 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 035c15fef..aed5598c0 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -164,26 +164,6 @@
- restart master api
- restart master controllers
-- name: Configure master to use etcd3 storage backend on 3.6 clean installs
- yedit:
- src: /etc/origin/master/master-config.yaml
- key: "{{ item.key }}"
- value: "{{ item.value }}"
- with_items:
- - key: kubernetesMasterConfig.apiServerArguments.storage-backend
- value:
- - etcd3
- - key: kubernetesMasterConfig.apiServerArguments.storage-media-type
- value:
- - application/vnd.kubernetes.protobuf
- when:
- - r_openshift_master_clean_install
- - openshift.common.version_gte_3_6
- notify:
- - restart master
- - restart master api
- - restart master controllers
-
- include: set_loopback_context.yml
when: openshift.common.version_gte_3_2_or_1_2