Merge "Make all default values match overcloud defaults"

diff --cc cinder-storage.yaml
Simple merge

diff --cc compute.yaml
Simple merge

diff --cc controller.yaml
Simple merge

diff --cc puppet/cinder-storage-puppet.yaml
Simple merge

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

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