diff options
| author |   Steven Hardy <shardy@redhat.com> | 2015-06-18 10:05:06 -0400 |
|---|---|---|
| committer |   Robert Pothier <rpothier@cisco.com> | 2015-07-06 10:56:11 -0400 |
| commit | e4c4c4068e817e30f46ba9ed475790f20343df18 (patch) | |
| tree | bb6223a657e5458d6681370c3a0b4fa0f2873e04 /puppet/extraconfig/pre_deploy/default.yaml | |
| parent | 45327bc18712b90d00a8ae0d61df210f46ec3376 (diff) | |
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
Diffstat (limited to 'puppet/extraconfig/pre_deploy/default.yaml')
| -rw-r--r-- | puppet/extraconfig/pre_deploy/default.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/extraconfig/pre_deploy/default.yaml b/puppet/extraconfig/pre_deploy/default.yaml new file mode 100644 index 00000000..dcbc6811 --- /dev/null +++ b/puppet/extraconfig/pre_deploy/default.yaml @@ -0,0 +1,8 @@ +heat_template_version: 2014-10-16 +description: 'Noop Extra Pre-Deployment Config' +parameters: + server: + type: string +outputs: + deploy_stdout: + value: "None" |