summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-06-28 11:42:04 -0400
committerSteve Milner <smilner@redhat.com>2017-06-28 11:42:04 -0400
commite882ec3b7a3013eac1deb3859ed81d21d36a61e9 (patch)
treefe8ee8593442f7a29f1f5b6c910b84acf41b61bb
parent9613d2e517ced0bc5d165801df3442ab331d214c (diff)
downloadopenshift-e882ec3b7a3013eac1deb3859ed81d21d36a61e9.tar.gz
openshift-e882ec3b7a3013eac1deb3859ed81d21d36a61e9.tar.bz2
openshift-e882ec3b7a3013eac1deb3859ed81d21d36a61e9.tar.xz
openshift-e882ec3b7a3013eac1deb3859ed81d21d36a61e9.zip
etcd_migrate: Add /usr/local/bin to path for oadm
There are cases where ansible may not keep the expected environment PATH. This change adds /usr/local/bin to the PATH on the oadm call. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1464010
-rw-r--r--roles/etcd_migrate/tasks/migrate.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/etcd_migrate/tasks/migrate.yml b/roles/etcd_migrate/tasks/migrate.yml
index 27eb945aa..eb1844fea 100644
--- a/roles/etcd_migrate/tasks/migrate.yml
+++ b/roles/etcd_migrate/tasks/migrate.yml
@@ -31,6 +31,8 @@
name: "{{ l_etcd_service }}"
state: started
+# NOTE: /usr/local/bin may be removed from the PATH by ansible hence why
+# it's added to the environment in this task.
- name: Re-introduce leases (as a replacement for key TTLs)
command: >
oadm migrate etcd-ttl \
@@ -42,6 +44,7 @@
--lease-duration 1h
environment:
ETCDCTL_API: 3
+ PATH: "/usr/local/bin:{{ ansible_env.PATH }}"
with_items:
- "/kubernetes.io/events"
- "/kubernetes.io/masterleases"