Merge "Move *Flavor parameters into per-role templates"

diff --cc overcloud.yaml
Simple merge

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

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

diff --cc puppet/compute.yaml
Simple merge

diff --cc puppet/controller.yaml
Simple merge

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