Wire in Controller pre-deployment extraconfig
authorSteven Hardy <shardy@redhat.com>
Thu, 18 Jun 2015 14:05:06 +0000 (10:05 -0400)
committerRobert Pothier <rpothier@cisco.com>
Mon, 6 Jul 2015 14:56:11 +0000 (10:56 -0400)
commite4c4c4068e817e30f46ba9ed475790f20343df18
treebb6223a657e5458d6681370c3a0b4fa0f2873e04
parent45327bc18712b90d00a8ae0d61df210f46ec3376
Wire in Controller pre-deployment extraconfig

The recently added cinder-netapp extraconfig contains some additional
hieradata which needs to be applied during the initial pre-deployment
phase, e.g in controller-puppet.yaml (before the manifests are applied)
so wire in a new OS::TripleO::ControllerExtraConfigPre provider resource
which allows passing in a nested stack (empty by default) which contains
any required "pre deployment" extraconfig, such as applying this hieradata.

Some changes were required to the cinder-netapp extraconfig and environment
such that now the hieradata is actually applied, and the parameter_defaults
specified will be correctly mapped into the StructuredDeployment.

Change-Id: I8838a71db9447466cc84283b0b257bdb70353ffd
environments/cinder-netapp-config.yaml
extraconfig/controller/cinder-netapp.yaml [deleted file]
extraconfig/controller/noop.yaml [deleted file]
extraconfig/post_deploy/README [new file with mode: 0644]
overcloud-resource-registry-puppet.yaml
puppet/controller-puppet.yaml
puppet/extraconfig/pre_deploy/README [new file with mode: 0644]
puppet/extraconfig/pre_deploy/controller/cinder-netapp.yaml [new file with mode: 0644]
puppet/extraconfig/pre_deploy/controller/multiple.yaml [new file with mode: 0644]
puppet/extraconfig/pre_deploy/default.yaml [new file with mode: 0644]