From 2611582aa596e74b618a813b20ac3954619b7d79 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 4 Jul 2016 18:56:19 +0100 Subject: Move AllNodesValidationDeployments into jinja template loop These are identical for all roles, so move them into the per-role loop Partially-Implements: blueprint custom-roles Change-Id: Id85b830a0e225912a3ea8c8b17a11fc424f68bb0 --- overcloud.j2.yaml | 49 +++++++++---------------------------------------- 1 file 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: -- cgit 1.2.3-korg