Merge "switch to vxlan by default"

diff --cc compute.yaml
Simple merge

diff --cc controller.yaml
Simple merge

diff --cc overcloud-without-mergepy.yaml
Simple merge

diff --cc puppet/compute-puppet.yaml
Simple merge

diff --cc puppet/controller-puppet.yaml
Simple merge