diff options
| author |   Nicholas Randon <nicholas.randon@hp.com> | 2014-07-30 10:17:56 +0100 |
|---|---|---|
| committer | Nicholas Randon <nicholas.randon@hp.com> | 2014-07-31 12:40:16 +0100 |
| commit | 8e462c756ebf20bd39885ba64b80af0bcf49a73e (patch) | |
| tree | fc56c931c7e03ffe1d1fc35b09b56d35cb888ee7 | |
| parent | 196d3b677d13b0bbaf9213bbd83a881a7dfe7120 (diff) | |
Correct overcloud template to inherit passthrough
Inherit passthrough from nova-compute-instance.yaml, rather than
having an exact copy in overcloud-source.yaml.
Change-Id: I4f5a4a7be5835cb68755734aa72f8d9670cba0d4
| -rw-r--r-- | overcloud-source.yaml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 7d5b53ac..28d66caf 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -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 |