Merge "NFS backend for Cinder"

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

diff --cc puppet/manifests/overcloud_compute.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge