Merge "Revert "Blacklist support for ExtraConfig""
authorJenkins <jenkins@review.openstack.org>
Thu, 22 Jun 2017 21:22:02 +0000 (21:22 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 22 Jun 2017 21:22:02 +0000 (21:22 +0000)
commit7b60e56c0eb90e2a710cc5be7527e58d254621be
treea9de13e6357d32351b8f04b6c76d4315e499c92b
parent57c6d270a4fa4fe5632cf0bda85121a0719ba5e8
parent69936229f4def703cd44ab164d8d1989c9fa37cb
Merge "Revert "Blacklist support for ExtraConfig""
puppet/blockstorage-role.yaml
puppet/cephstorage-role.yaml
puppet/compute-role.yaml
puppet/controller-role.yaml
puppet/objectstorage-role.yaml
puppet/role.role.j2.yaml