diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-15 12:44:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-15 12:44:50 +0000 |
| commit | 5e2e52aceb02d8e12bd7ce86d99f208c4fb850d8 (patch) | |
| tree | e0217c72921d8cc6bb9b67f0fc13d98e8d54ac1f | |
| parent | 2656fa938d6ff1b8807d59fd06afff14786dbd74 (diff) | |
| parent | de1ea55597b22bfbd8ba51b801a52c43cbd04555 (diff) | |
Merge "Add strict dependencies to the undercloud template"
| -rw-r--r-- | undercloud-bm-nova-deploy.yaml | 2 | ||||
| -rw-r--r-- | undercloud-source.yaml | 6 | ||||
| -rw-r--r-- | undercloud-vm-ironic-deploy.yaml | 5 | ||||
| -rw-r--r-- | undercloud-vm-nova-deploy.yaml | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/undercloud-bm-nova-deploy.yaml b/undercloud-bm-nova-deploy.yaml index 3df85970..d328449c 100644 --- a/undercloud-bm-nova-deploy.yaml +++ b/undercloud-bm-nova-deploy.yaml @@ -12,7 +12,7 @@ parameters: description: Timeout for PXE deployment of baremetal nodes type: number resources: - 01_undercloudNovaDeployment: + undercloudNovaDeployment: type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudNovaConfig} diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 741d3ae2..e09b3db5 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -319,7 +319,8 @@ resources: networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG - 99_undercloudDeployment: + undercloudDeployment: + depends_on: [undercloudPassthroughDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudConfig} @@ -354,7 +355,8 @@ resources: - - 'http://' - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000/v1/waitcondition' - 00_undercloudPassthroughDeployment: + undercloudPassthroughDeployment: + depends_on: [undercloudNovaDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudPassthroughConfig} diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml index 8fff9d54..6e778e59 100644 --- a/undercloud-vm-ironic-deploy.yaml +++ b/undercloud-vm-ironic-deploy.yaml @@ -12,7 +12,8 @@ parameters: type: string hidden: true resources: - 01_undercloudNovaDeployment: + undercloudNovaDeployment: + depends_on: [undercloudIronicDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudNovaConfig} @@ -20,7 +21,7 @@ resources: signal_transport: NO_SIGNAL input_values: nova_service_password: {get_param: NovaPassword} - 02_undercloudIronicDeployment: + undercloudIronicDeployment: type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudIronicConfig} diff --git a/undercloud-vm-nova-deploy.yaml b/undercloud-vm-nova-deploy.yaml index 14809384..ebd14ef6 100644 --- a/undercloud-vm-nova-deploy.yaml +++ b/undercloud-vm-nova-deploy.yaml @@ -24,7 +24,7 @@ parameters: description: What username to ssh to the virtual power host with. type: string resources: - 01_undercloudNovaDeployment: + undercloudNovaDeployment: type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudNovaConfig} |