Merge "Add allNodesConfig to Swift storage nodes"

This commit is contained in:
Jenkins 2015-02-24 21:17:36 +00:00 committed by Gerrit Code Review
commit 758c6f1597

View File

@ -783,6 +783,12 @@ resources:
config: {get_attr: [allNodesConfig, config_id]} config: {get_attr: [allNodesConfig, config_id]}
servers: {get_attr: [BlockStorage, attributes, nova_server_resource]} servers: {get_attr: [BlockStorage, attributes, nova_server_resource]}
ObjectStorageAllNodesDeployment:
type: OS::Heat::StructuredDeployments
properties:
config: {get_attr: [allNodesConfig, config_id]}
servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}
# Nested stack deployment runs after all other controller deployments # Nested stack deployment runs after all other controller deployments
ControllerNodesPostDeployment: ControllerNodesPostDeployment:
type: OS::TripleO::ControllerPostDeployment type: OS::TripleO::ControllerPostDeployment
@ -798,7 +804,7 @@ resources:
ObjectStorageNodesPostDeployment: ObjectStorageNodesPostDeployment:
type: OS::TripleO::ObjectStoragePostDeployment type: OS::TripleO::ObjectStoragePostDeployment
depends_on: ObjectStorageSwiftDeployment depends_on: [ObjectStorageSwiftDeployment, ObjectStorageAllNodesDeployment]
properties: properties:
servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]} servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]}