diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-25 08:11:44 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-25 08:11:44 -0700 |
commit | 67ff061a940a4b9dce6686b8a00a3eb52aeeb698 (patch) | |
tree | 0c5fb80ab97cf0762a496a798c05ff85067178af /roles/etcd_upgrade/tasks/main.yml | |
parent | c390d382a2c1783964179490eec810ee2206fa32 (diff) | |
parent | 2c8d16c36b8eec5c2a82fb5da7291736654e55f2 (diff) | |
download | openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.tar.gz openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.tar.bz2 openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.tar.xz openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.zip |
Merge pull request #5451 from ingvagabund/consolidate-etcd-upgrade
Automatic merge from submit-queue
Consolidate etcd upgrade
Consolidates `etcd_upgrade` into the `etcd` role.
Diffstat (limited to 'roles/etcd_upgrade/tasks/main.yml')
-rw-r--r-- | roles/etcd_upgrade/tasks/main.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/roles/etcd_upgrade/tasks/main.yml b/roles/etcd_upgrade/tasks/main.yml deleted file mode 100644 index 129c69d6b..000000000 --- a/roles/etcd_upgrade/tasks/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# INPUT r_etcd_upgrade_action -- name: Fail if invalid etcd_upgrade_action provided - fail: - msg: "etcd_upgrade role can only be called with 'upgrade'" - when: - - r_etcd_upgrade_action not in ['upgrade'] - -- name: Detecting Atomic Host Operating System - stat: - path: /run/ostree-booted - register: l_ostree_booted - -- include: "{{ r_etcd_upgrade_action }}.yml" |