diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-10-16 15:42:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-10-16 15:42:43 +0000 |
| commit | 83914a012b85dc22c401ec484e74f947e825b132 (patch) | |
| tree | dc48b7a3dbcd89247d5c8b8178d3d8ce84e96c7d | |
| parent | ad0692e3e8b5aff92e919a3a9f702697ec52e659 (diff) | |
| parent | faf2c2f45ab77c650c399a01694fc8c1d635a347 (diff) | |
Merge "Refactor Heat dependencies for nova compute"
| -rw-r--r-- | nova-compute-instance.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 2fdf97b8..ab958b77 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -207,7 +207,6 @@ resources: - network: ctlplane user_data_format: SOFTWARE_CONFIG NovaCompute0Deployment: - depends_on: [controller0AllNodesDeployment] type: OS::Heat::StructuredDeployment properties: signal_transport: NO_SIGNAL @@ -254,14 +253,16 @@ resources: live_update_image_id: {get_param: LiveUpdateComputeImage} ntp_server: {get_param: NtpServer} NovaCompute0AllNodesDeployment: - depends_on: [NovaCompute0Passthrough] + depends_on: + - controller0AllNodesDeployment + - NovaCompute0Deployment + - NovaCompute0PassthroughSpecific type: OS::Heat::StructuredDeployment properties: signal_transport: {get_param: DefaultSignalTransport} config: {get_param: AllNodesConfig} server: {get_resource: NovaCompute0} NovaCompute0Passthrough: - depends_on: [NovaCompute0Deployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: NovaComputePassthrough} |