Merge "We don't need to set a default for the CephX keys and cluster FSID"
authorJenkins <jenkins@review.openstack.org>
Fri, 29 Jul 2016 10:20:46 +0000 (10:20 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 29 Jul 2016 10:20:46 +0000 (10:20 +0000)
1  2 
puppet/services/ceph-base.yaml
puppet/services/ceph-external.yaml
puppet/services/ceph-mon.yaml

Simple merge
Simple merge
Simple merge