Merge "Adding optional aci-opflex hiera data"
authorJenkins <jenkins@review.openstack.org>
Thu, 25 Aug 2016 22:08:33 +0000 (22:08 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 25 Aug 2016 22:08:33 +0000 (22:08 +0000)
commit60f528f277bfb07e9107f60684d8f0f537f4c760
treea119e6798aad0b93f72be83c281a46d0b1a1104d
parent68927e683c15a23f5f7186d486db4b7f067dff3a
parent4638c80ce0d606023b8d1f51e24e392a582344da
Merge "Adding optional aci-opflex hiera data"
puppet/compute.yaml
puppet/controller.yaml