shixiong/okd @ c2c5f0260e355efd735eec5bfbc81fde1e50f0a1

OpenShift Merge Robot 9c08d4232f Merge pull request #7818 from mgugino-upstream-stage/upgrade-include-import-cleanup		vor 7 Jahren
..
upgrade	3c735da26f Change include_ to import_ where possible	vor 7 Jahren
bootstrap.yml	2ec29638ef Fix references to oc client	vor 7 Jahren
bootstrap_settings.yml	ddf1aa2f1a Switch the master to always run with bootstrapping on	vor 7 Jahren
check_existing_config.yml	581591970b Refactor session authentication secrets	vor 7 Jahren
check_master_api_is_ready.yml	ddf1aa2f1a Switch the master to always run with bootstrapping on	vor 7 Jahren
configure_external_etcd.yml	b17728d542 Add new openshift_control_plane and openshift_sdn roles	vor 7 Jahren
ensure_nodes_matching_selector.yml	ddf1aa2f1a Switch the master to always run with bootstrapping on	vor 7 Jahren
firewall.yml	b17728d542 Add new openshift_control_plane and openshift_sdn roles	vor 7 Jahren
generate_session_secrets.yml	4e96d40392 Fix generate_session_secrets	vor 7 Jahren
main.yml	3c735da26f Change include_ to import_ where possible	vor 7 Jahren
registry_auth.yml	b17728d542 Add new openshift_control_plane and openshift_sdn roles	vor 7 Jahren
restart.yml	8c0ce4e740 In master bootstrapping mode, use the new openshift_control_plane role	vor 7 Jahren
set_loopback_context.yml	b17728d542 Add new openshift_control_plane and openshift_sdn roles	vor 7 Jahren
static.yml	270cfe0e4a Use oreg_url for node and master images	vor 7 Jahren
static_shim.yml	8c0ce4e740 In master bootstrapping mode, use the new openshift_control_plane role	vor 7 Jahren
update-vsphere.yml	3c735da26f Change include_ to import_ where possible	vor 7 Jahren
update_etcd_client_urls.yml	352dd79798 Remove etcd_hosts and etcd_urls from openshift_facts	vor 7 Jahren
upgrade.yml	3c735da26f Change include_ to import_ where possible	vor 7 Jahren