Merge pull request #2257 from rzenker/tb/baremetal-tweaks

roles/bootstrap-os/defaults/main.yml

roles/bootstrap-os/tasks/main.yml

roles/kubernetes/node/defaults/main.yml

roles/network_plugin/calico/templates/calico-config.yml.j2

roles/network_plugin/calico/templates/cni-calico.conflist.j2

roles/reset/defaults/main.yml

roles/reset/tasks/main.yml