openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add strict dependencies to the undercloud template"

Browse Source
This commit is contained in:
Jenkins 2014-08-15 12:44:50 +00:00 committed by Gerrit Code Review
commit 5e2e52aceb
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
undercloud-bm-nova-deploy.yaml
View File

@ -12,7 +12,7 @@ parameters:
description: Timeout for PXE deployment of baremetal nodes description: Timeout for PXE deployment of baremetal nodes
type: number type: number
resources: resources:
01_undercloudNovaDeployment: undercloudNovaDeployment:
type: OS::Heat::StructuredDeployment type: OS::Heat::StructuredDeployment
properties: properties:
config: {get_resource: undercloudNovaConfig} config: {get_resource: undercloudNovaConfig}

6
undercloud-source.yaml
View File

@ -319,7 +319,8 @@ resources:
networks: networks:
- network: ctlplane - network: ctlplane
user_data_format: SOFTWARE_CONFIG user_data_format: SOFTWARE_CONFIG
99_undercloudDeployment: undercloudDeployment:
depends_on: [undercloudPassthroughDeployment]
type: OS::Heat::StructuredDeployment type: OS::Heat::StructuredDeployment
properties: properties:
config: {get_resource: undercloudConfig} config: {get_resource: undercloudConfig}
@ -354,7 +355,8 @@ resources:
- - 'http://' - - 'http://'
- {get_attr: [undercloud, networks, ctlplane, 0]} - {get_attr: [undercloud, networks, ctlplane, 0]}
- ':8000/v1/waitcondition' - ':8000/v1/waitcondition'
00_undercloudPassthroughDeployment: undercloudPassthroughDeployment:
depends_on: [undercloudNovaDeployment]
type: OS::Heat::StructuredDeployment type: OS::Heat::StructuredDeployment
properties: properties:
config: {get_resource: undercloudPassthroughConfig} config: {get_resource: undercloudPassthroughConfig}

5
undercloud-vm-ironic-deploy.yaml
View File

@ -12,7 +12,8 @@ parameters:
type: string type: string
hidden: true hidden: true
resources: resources:
01_undercloudNovaDeployment: undercloudNovaDeployment:
depends_on: [undercloudIronicDeployment]
type: OS::Heat::StructuredDeployment type: OS::Heat::StructuredDeployment
properties: properties:
config: {get_resource: undercloudNovaConfig} config: {get_resource: undercloudNovaConfig}
@ -20,7 +21,7 @@ resources:
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
input_values: input_values:
nova_service_password: {get_param: NovaPassword} nova_service_password: {get_param: NovaPassword}
02_undercloudIronicDeployment: undercloudIronicDeployment:
type: OS::Heat::StructuredDeployment type: OS::Heat::StructuredDeployment
properties: properties:
config: {get_resource: undercloudIronicConfig} config: {get_resource: undercloudIronicConfig}

2
undercloud-vm-nova-deploy.yaml
View File

@ -24,7 +24,7 @@ parameters:
description: What username to ssh to the virtual power host with. description: What username to ssh to the virtual power host with.
type: string type: string
resources: resources:
01_undercloudNovaDeployment: undercloudNovaDeployment:
type: OS::Heat::StructuredDeployment type: OS::Heat::StructuredDeployment
properties: properties:
config: {get_resource: undercloudNovaConfig} config: {get_resource: undercloudNovaConfig}