diff options
author | Steven Hardy <shardy@redhat.com> | 2016-05-12 14:58:39 +0100 |
---|---|---|
committer | Steven Hardy <shardy@redhat.com> | 2016-07-04 21:24:16 +0100 |
commit | 59b6afcd35f9fc136f75b22c0b51bbe8f7005a6a (patch) | |
tree | 02dce17867fffe84fbc15ab08cbc703238ec0521 /overcloud.yaml | |
parent | 794fece5cc25d74ca0d874174e2c837a15750fbf (diff) |
Replace NodeConfigIdentifiers with DeployIdentifier
We added NodeConfigIdentifiers to trigger config to be re-applied on
update, but then later added DeployIdentifier which forces config to
*always* be applied on update, so we can simplify things by just
referencing the DeployIdentifier directly.
Change-Id: I79212def1936740825b714419dcb4952bc586a39
Diffstat (limited to 'overcloud.yaml')
-rw-r--r-- | overcloud.yaml | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index e6f23d8c..f9b7d65b 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -1392,10 +1392,6 @@ resources: depends_on: [ControllerBootstrapNodeDeployment, ControllerAllNodesDeployment, ControllerSwiftDeployment, ControllerCephDeployment] properties: servers: {get_attr: [Controller, attributes, nova_server_resource]} - NodeConfigIdentifiers: - allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} - controller_config: {get_attr: [Controller, attributes, config_identifier]} - deployment_identifier: {get_param: DeployIdentifier} RoleData: {get_attr: [ControllerServiceChain, role_data]} ComputeNodesPostDeployment: @@ -1403,10 +1399,6 @@ resources: depends_on: [ComputeAllNodesDeployment, ComputeCephDeployment] properties: servers: {get_attr: [Compute, attributes, nova_server_resource]} - NodeConfigIdentifiers: - allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} - compute_config: {get_attr: [Compute, attributes, config_identifier]} - deployment_identifier: {get_param: DeployIdentifier} RoleData: {get_attr: [ComputeServiceChain, role_data]} ObjectStorageNodesPostDeployment: @@ -1414,10 +1406,6 @@ resources: depends_on: [ObjectStorageSwiftDeployment, ObjectStorageAllNodesDeployment] properties: servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]} - NodeConfigIdentifiers: - allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} - objectstorage_config: {get_attr: [ObjectStorage, attributes, config_identifier]} - deployment_identifier: {get_param: DeployIdentifier} RoleData: {get_attr: [ObjectStorageServiceChain, role_data]} BlockStorageNodesPostDeployment: @@ -1425,10 +1413,6 @@ resources: depends_on: [ControllerNodesPostDeployment, BlockStorageAllNodesDeployment] properties: servers: {get_attr: [BlockStorage, attributes, nova_server_resource]} - NodeConfigIdentifiers: - allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} - blockstorage_config: {get_attr: [BlockStorage, attributes, config_identifier]} - deployment_identifier: {get_param: DeployIdentifier} RoleData: {get_attr: [BlockStorageServiceChain, role_data]} CephStorageNodesPostDeployment: @@ -1436,10 +1420,6 @@ resources: depends_on: [ControllerNodesPostDeployment, CephStorageCephDeployment, CephStorageAllNodesDeployment] properties: servers: {get_attr: [CephStorage, attributes, nova_server_resource]} - NodeConfigIdentifiers: - allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} - cephstorage_config: {get_attr: [CephStorage, attributes, config_identifier]} - deployment_identifier: {get_param: DeployIdentifier} RoleData: {get_attr: [CephStorageServiceChain, role_data]} outputs: |