shixiong/okd @ 67ff061a940a4b9dce6686b8a00a3eb52aeeb698

OpenShift Merge Robot 67ff061a94 Merge pull request #5451 from ingvagabund/consolidate-etcd-upgrade		%!s(int64=7) %!d(string=hai) anos
..
auxiliary	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
ca	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
client_certificates	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
migration	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
server_certificates	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
upgrade	2c8d16c36b consolidate etcd_upgrade role	%!s(int64=7) %!d(string=hai) anos
ca.yml	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
clean_data.yml	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
client_certificates.yml	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
firewall.yml	7d50ffe98d Updated README to reflect refactor. Moved firewall initialize into separate file.	%!s(int64=7) %!d(string=hai) anos
main.yml	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
migrate.add_ttls.yml	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
migrate.configure_master.yml	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
migrate.pre_check.yml	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
migrate.yml	f8664e17ef consolidate etcd_migrate role	%!s(int64=7) %!d(string=hai) anos
server_certificates.yml	99745a0422 Consolidate etcd certs roles	%!s(int64=7) %!d(string=hai) anos
system_container.yml	ddfb742877 etcd, syscontainer: fix copy of existing datastore	%!s(int64=7) %!d(string=hai) anos
upgrade_image.yml	2c8d16c36b consolidate etcd_upgrade role	%!s(int64=7) %!d(string=hai) anos
upgrade_rpm.yml	2c8d16c36b consolidate etcd_upgrade role	%!s(int64=7) %!d(string=hai) anos