Merge "Enable splay for os-collect-config"

diff --cc puppet/blockstorage-role.yaml
Simple merge

diff --cc puppet/cephstorage-role.yaml
Simple merge

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

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

diff --cc puppet/objectstorage-role.yaml
Simple merge

diff --cc puppet/role.role.j2.yaml
Simple merge