This patch modifies the interface for the -post stacks so
that we pass RoleData instead of just the StepConfig
into each -post.yaml template.
This will facilitate creating other types of -post.yaml scripts
that require more data that just 'step_config'. Things like
containers, etc. will require this.
Change-Id: I2527fc0098192f092f5e9046033a04bc71be2cae
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
controller_config: {get_attr: [Controller, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
controller_config: {get_attr: [Controller, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
- StepConfig: {get_attr: [ControllerServiceChain, role_data, step_config]}
+ RoleData: {get_attr: [ControllerServiceChain, role_data]}
ComputeNodesPostDeployment:
type: OS::TripleO::ComputePostDeployment
ComputeNodesPostDeployment:
type: OS::TripleO::ComputePostDeployment
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
compute_config: {get_attr: [Compute, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
compute_config: {get_attr: [Compute, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
- StepConfig: {get_attr: [ComputeServiceChain, role_data, step_config]}
+ RoleData: {get_attr: [ComputeServiceChain, role_data]}
ObjectStorageNodesPostDeployment:
type: OS::TripleO::ObjectStoragePostDeployment
ObjectStorageNodesPostDeployment:
type: OS::TripleO::ObjectStoragePostDeployment
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
objectstorage_config: {get_attr: [ObjectStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
objectstorage_config: {get_attr: [ObjectStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
- StepConfig: {get_attr: [ObjectStorageServiceChain, role_data, step_config]}
+ RoleData: {get_attr: [ObjectStorageServiceChain, role_data]}
BlockStorageNodesPostDeployment:
type: OS::TripleO::BlockStoragePostDeployment
BlockStorageNodesPostDeployment:
type: OS::TripleO::BlockStoragePostDeployment
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
blockstorage_config: {get_attr: [BlockStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
blockstorage_config: {get_attr: [BlockStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
- StepConfig: {get_attr: [BlockStorageServiceChain, role_data, step_config]}
-
+ RoleData: {get_attr: [BlockStorageServiceChain, role_data]}
CephStorageNodesPostDeployment:
type: OS::TripleO::CephStoragePostDeployment
CephStorageNodesPostDeployment:
type: OS::TripleO::CephStoragePostDeployment
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
cephstorage_config: {get_attr: [CephStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
cephstorage_config: {get_attr: [CephStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
- StepConfig: {get_attr: [CephStorageServiceChain, role_data, step_config]}
+ RoleData: {get_attr: [CephStorageServiceChain, role_data]}
servers:
type: json
NodeConfigIdentifiers:
servers:
type: json
NodeConfigIdentifiers:
- type: json
- description: Value which changes if the node configuration may need to be re-applied
- StepConfig:
- type: string
- description: Config manifests that will be used to step through the deployment.
- default: ''
+ type: json
+ description: Value which changes if the node configuration may need to be re-applied
+ RoleData:
+ type: json
+ default: {}
list_join:
- ''
- - get_file: manifests/overcloud_cephstorage.pp
list_join:
- ''
- - get_file: manifests/overcloud_cephstorage.pp
- - {get_param: StepConfig}
+ - {get_param: [RoleData, step_config]}
CephStorageDeployment_Step2:
type: OS::Heat::StructuredDeployments
CephStorageDeployment_Step2:
type: OS::Heat::StructuredDeployments
NodeConfigIdentifiers:
type: json
description: Value which changes if the node configuration may need to be re-applied
NodeConfigIdentifiers:
type: json
description: Value which changes if the node configuration may need to be re-applied
- StepConfig:
- type: string
- description: Config manifests that will be used to step through the deployment.
- default: ''
+ RoleData:
+ type: json
+ default: {}
list_join:
- ''
- - get_file: manifests/overcloud_volume.pp
list_join:
- ''
- - get_file: manifests/overcloud_volume.pp
- - {get_param: StepConfig}
+ - {get_param: [RoleData, step_config]}
VolumeDeployment_Step2:
type: OS::Heat::StructuredDeployments
VolumeDeployment_Step2:
type: OS::Heat::StructuredDeployments
servers:
type: json
NodeConfigIdentifiers:
servers:
type: json
NodeConfigIdentifiers:
- type: json
- description: Value which changes if the node configuration may need to be re-applied
- StepConfig:
- type: string
- description: Config manifests that will be used to step through the deployment.
- default: ''
+ type: json
+ description: Value which changes if the node configuration may need to be re-applied
+ RoleData:
+ type: json
+ default: {}
list_join:
- ''
- - get_file: manifests/overcloud_compute.pp
list_join:
- ''
- - get_file: manifests/overcloud_compute.pp
- - {get_param: StepConfig}
+ - {get_param: [RoleData, step_config]}
ComputeServicesBaseDeployment_Step2:
type: OS::Heat::StructuredDeployments
ComputeServicesBaseDeployment_Step2:
type: OS::Heat::StructuredDeployments
servers:
type: json
NodeConfigIdentifiers:
servers:
type: json
NodeConfigIdentifiers:
- type: json
- description: Value which changes if the node configuration may need to be re-applied
- StepConfig:
- type: string
- description: Config manifests that will be used to step through the deployment.
- default: ''
+ type: json
+ description: Value which changes if the node configuration may need to be re-applied
+ RoleData:
+ type: json
+ default: {}
ControllerPuppetConfig:
type: OS::TripleO::ControllerConfig
properties:
ControllerPuppetConfig:
type: OS::TripleO::ControllerConfig
properties:
- StepConfig: {get_param: StepConfig}
+ StepConfig: {get_param: [RoleData, step_config]}
# Step through a series of Puppet runs using the same manifest.
# NOTE: To enable stepping through the deployments via heat hooks,
# Step through a series of Puppet runs using the same manifest.
# NOTE: To enable stepping through the deployments via heat hooks,
servers:
type: json
NodeConfigIdentifiers:
servers:
type: json
NodeConfigIdentifiers:
- type: json
- description: Value which changes if the node configuration may need to be re-applied
- StepConfig:
- type: string
- description: Config manifests that will be used to step through the deployment.
- default: ''
+ type: json
+ description: Value which changes if the node configuration may need to be re-applied
+ RoleData:
+ type: json
+ default: {}
- ''
- - get_file: manifests/overcloud_object.pp
- get_file: manifests/ringbuilder.pp
- ''
- - get_file: manifests/overcloud_object.pp
- get_file: manifests/ringbuilder.pp
- - {get_param: StepConfig}
+ - {get_param: [RoleData, step_config]}
StorageRingbuilderDeployment_Step2:
type: OS::Heat::StructuredDeployments
StorageRingbuilderDeployment_Step2:
type: OS::Heat::StructuredDeployments