diff options
author | 2016-09-10 07:55:30 +0000 | |
---|---|---|
committer | 2016-09-10 07:55:30 +0000 | |
commit | 6fabca4dafb3fe7f32fb449e406e8616a292ec5e (patch) | |
tree | 40ba34ea40f537e27a33576b85ccda66ad97d9e5 | |
parent | 9b805f3dcd2b43cc67fbb5277b22d1fce5491daf (diff) | |
parent | 2611582aa596e74b618a813b20ac3954619b7d79 (diff) |
Merge "Move AllNodesValidationDeployments into jinja template loop"
-rw-r--r-- | overcloud.j2.yaml | 49 |
1 files changed, 9 insertions, 40 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 16db3797..ec6f052d 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -273,6 +273,15 @@ resources: input_values: bootstrap_nodeid: {get_attr: [{{role.name}}, resource.0.hostname]} bootstrap_nodeid_ip: {get_attr: [{{role.name}}, resource.0.ip_address]} + + {{role.name}}AllNodesValidationDeployment: + type: OS::Heat::StructuredDeployments + depends_on: {{role.name}}AllNodesDeployment + properties: + name: {{role.name}}AllNodesValidationDeployment + config: {get_resource: AllNodesValidationConfig} + servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]} + {% endfor %} Controller: @@ -670,46 +679,6 @@ resources: - {get_attr: [Controller, resource.0.tenant_ip_address]} - {get_attr: [Controller, resource.0.management_ip_address]} - ControllerAllNodesValidationDeployment: - type: OS::Heat::StructuredDeployments - depends_on: ControllerAllNodesDeployment - properties: - name: ControllerAllNodesValidationDeployment - config: {get_resource: AllNodesValidationConfig} - servers: {get_attr: [Controller, attributes, nova_server_resource]} - - ComputeAllNodesValidationDeployment: - type: OS::Heat::StructuredDeployments - depends_on: ComputeAllNodesDeployment - properties: - name: ComputeAllNodesValidationDeployment - config: {get_resource: AllNodesValidationConfig} - servers: {get_attr: [Compute, attributes, nova_server_resource]} - - BlockStorageAllNodesValidationDeployment: - type: OS::Heat::StructuredDeployments - depends_on: BlockStorageAllNodesDeployment - properties: - name: BlockStorageAllNodesValidationDeployment - config: {get_resource: AllNodesValidationConfig} - servers: {get_attr: [BlockStorage, attributes, nova_server_resource]} - - ObjectStorageAllNodesValidationDeployment: - type: OS::Heat::StructuredDeployments - depends_on: ObjectStorageAllNodesDeployment - properties: - name: ObjectStorageAllNodesValidationDeployment - config: {get_resource: AllNodesValidationConfig} - servers: {get_attr: [ObjectStorage, attributes, nova_server_resource]} - - CephStorageAllNodesValidationDeployment: - type: OS::Heat::StructuredDeployments - depends_on: CephStorageAllNodesDeployment - properties: - name: CephStorageAllNodesValidationDeployment - config: {get_resource: AllNodesValidationConfig} - servers: {get_attr: [CephStorage, attributes, nova_server_resource]} - UpdateWorkflow: type: OS::TripleO::Tasks::UpdateWorkflow properties: |