summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-12-11 16:13:11 -0800
committerGitHub <noreply@github.com>2017-12-11 16:13:11 -0800
commitcf1c664948b6c3aaf57bad485fdd1daa201d9c8c (patch)
tree409b82d7d614dad2fb80eb8b794f6667f8679132 /playbooks/common/openshift-cluster
parent24a48f8ed440b808265982d848a0af050920d73c (diff)
parented4d3fb42125405f8dd0765b4a42c618a9916f22 (diff)
downloadopenshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.gz
openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.bz2
openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.tar.xz
openshift-cf1c664948b6c3aaf57bad485fdd1daa201d9c8c.zip
Merge pull request #6414 from mgugino-upstream-stage/remove-embedded-etcd
Automatic merge from submit-queue. Remove unneeded embedded etcd logic Removing some remaining embedded etcd facts except for the migration plays.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml14
1 files changed, 0 insertions, 14 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 37fc8a0f6..7b82fe05b 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -2,20 +2,6 @@
###############################################################################
# Upgrade Masters
###############################################################################
-
-# If facts cache were for some reason deleted, this fact may not be set, and if not set
-# it will always default to true. This causes problems for the etcd data dir fact detection
-# so we must first make sure this is set correctly before attempting the backup.
-- name: Set master embedded_etcd fact
- hosts: oo_masters_to_config
- roles:
- - openshift_facts
- tasks:
- - openshift_facts:
- role: master
- local_facts:
- embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
-
- name: Backup and upgrade etcd
import_playbook: ../../../openshift-etcd/private/upgrade_main.yml