shixiong/okd @ aad4ccce7ce6641d3c720507568f6da779a66995

OpenShift Bot 1f38d72448 Merge pull request #4547 from mtnbikenc/etcd-pre_upgrade-fix		%!s(int64=7) %!d(string=hai) anos
..
backup.yml	9a2352c645 set the proper label of /var/lib/etcd directory	%!s(int64=7) %!d(string=hai) anos
drop_etcdctl.yml	9e2fcb48c3 move etcd backup to etcd_common role	%!s(int64=7) %!d(string=hai) anos
main.yml	bb4bd3209c Don't include noop	%!s(int64=7) %!d(string=hai) anos