summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-29 09:55:23 -0500
committerGitHub <noreply@github.com>2016-11-29 09:55:23 -0500
commit73628ff2726b92c2ad98ae77aa88a8a84be2b86d (patch)
tree30cf080a6648a19a868e60ff3f7b9e2821153f49
parent9953d2502119a9669241e7596e3a643cbbc271ed (diff)
parent08010c30e154de39c5aa63dbe21e6664d0577fa3 (diff)
downloadopenshift-73628ff2726b92c2ad98ae77aa88a8a84be2b86d.tar.gz
openshift-73628ff2726b92c2ad98ae77aa88a8a84be2b86d.tar.bz2
openshift-73628ff2726b92c2ad98ae77aa88a8a84be2b86d.tar.xz
openshift-73628ff2726b92c2ad98ae77aa88a8a84be2b86d.zip
Merge pull request #2874 from sdodson/etcd_embedded_upgrade
etcd upgrade playbook is not currently applicable to embedded etcd in…
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/main.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
index cce844403..192799376 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
@@ -14,6 +14,9 @@
connection: local
become: no
tasks:
+ - fail:
+ msg: 'The etcd upgrade playbook does not support upgrading embedded etcd, simply run the normal playbooks and etcd will be upgraded when your master is updated.'
+ when: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
- name: Evaluate etcd_hosts_to_upgrade
add_host:
name: "{{ item }}"