Merge "Remove static hieradata"
authorJenkins <jenkins@review.openstack.org>
Tue, 9 Aug 2016 12:39:18 +0000 (12:39 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 9 Aug 2016 12:39:18 +0000 (12:39 +0000)
1  2 
puppet/ceph-storage.yaml
puppet/cinder-storage.yaml
puppet/compute.yaml
puppet/controller.yaml
puppet/swift-storage.yaml

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge