diff options
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index ce86dfa9..b8216cd9 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -307,7 +307,7 @@ Resources: length: 20 salt: Ref: RabbitCookieSalt - NovaCompute0Config: + NovaCompute0Deploy: Type: FileInclude Path: nova-compute-instance.yaml SubKey: Resources.NovaCompute0Deploy @@ -337,12 +337,10 @@ Resources: Parameters: AllNodesConfig: {Ref: allNodesConfig} NovaCompute0Passthrough: - Type: OS::Heat::StructuredDeployment - Properties: - config: {Ref: NovaComputePassthrough} - server: {Ref: NovaCompute0} - signal_transport: NO_SIGNAL - input_values: + Type: FileInclude + Path: nova-compute-instance.yaml + SubKey: Resources.NovaCompute0Passthrough + Parameters: passthrough_config: {Ref: ExtraConfig} NovaCompute0: Type: FileInclude @@ -618,7 +616,8 @@ Resources: networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG - controller0AllNodesConfig: + controller0AllNodes: + DependsOn: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0Passthrough] Type: OS::Heat::StructuredDeployment Properties: config: {Ref: allNodesConfig} |