resolved merge conflict ceph - rhmk

Puppetfile

examples/Puppetfile

examples/hiera.yaml

examples/hieradata/common.yaml

examples/manifest/site.pp

examples/metadata.json

manifests/init.pp

manifests/profile/base.pp

manifests/profile/database.pp

manifests/profile/glance.pp

manifests/profile/haproxy.pp

manifests/profile/keepalived.pp

manifests/profile/neutron/router.pp

manifests/profile/rabbitmq.pp

manifests/resources/database.pp

manifests/role/rabbitmqha.pp

manifests/role/rhmk.pp

metadata.json