Merge "Add hooks for extra post-deployment config"

This commit is contained in:
Jenkins 2015-04-29 18:57:02 +00:00 committed by Gerrit Code Review
commit 630fef16a5
13 changed files with 121 additions and 1 deletions

View File

@ -5,4 +5,14 @@ description: 'Ceph Storage Post Deployment'
parameters:
servers:
type: json
type: json
resources:
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -6,3 +6,13 @@ description: 'Common Block Storage Post Deployment'
parameters:
servers:
type: json
resources:
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -6,3 +6,14 @@ description: 'Compute Post Deployment'
parameters:
servers:
type: json
resources:
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -6,3 +6,12 @@ description: 'Controller Post Deployment'
parameters:
servers:
type: json
resources:
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -0,0 +1,5 @@
heat_template_version: 2014-10-16
description: 'Extra Post Deployment Config'
parameters:
servers:
type: json

View File

@ -0,0 +1,27 @@
heat_template_version: 2014-10-16
description: >
Example extra config for post-deployment
# Note extra parameters can be defined, then passed data via the
# environment parameter_defaults, without modifying the parent template
parameters:
servers:
type: json
resources:
ExtraConfig:
type: OS::Heat::SoftwareConfig
properties:
group: script
config: |
#!/bin/sh
echo "extra" > /root/extra
ExtraDeployments:
type: OS::Heat::StructuredDeployments
properties:
servers: {get_param: servers}
config: {get_resource: ExtraConfig}
actions: ['CREATE'] # Only do this on CREATE

View File

@ -20,6 +20,7 @@ resource_registry:
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
OS::TripleO::BootstrapNode::SoftwareConfig: puppet/bootstrap-config.yaml
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
parameter_defaults:
EnablePackageInstall: false

View File

@ -20,3 +20,4 @@ resource_registry:
OS::TripleO::AllNodes::SoftwareConfig: all-nodes-config.yaml
OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml

View File

@ -22,3 +22,12 @@ resources:
properties:
servers: {get_param: servers}
config: {get_resource: CephStoragePuppetConfig}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
depends_on: CephStorageDeployment_Step1
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -23,3 +23,12 @@ resources:
properties:
servers: {get_param: servers}
config: {get_resource: ComputePuppetConfig}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
depends_on: ComputePuppetDeployment
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -71,3 +71,12 @@ resources:
config: {get_resource: ControllerPuppetConfig}
input_values:
step: 3
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
depends_on: ControllerDeploymentOvercloudServices_Step4
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -37,3 +37,12 @@ resources:
properties:
servers: {get_param: servers}
config: {get_resource: StorageRingbuilderPuppetConfig}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
depends_on: StorageRingbuilderDeployment_Step2
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}

View File

@ -6,3 +6,13 @@ description: 'Swift Storage Post Deployment'
parameters:
servers:
type: json
resources:
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}