From: Nicholas Randon <nicholas.randon@hp.com>
Date: Wed, 30 Jul 2014 09:17:56 +0000 (+0100)
Subject: Correct overcloud template to inherit passthrough
X-Git-Tag: opnfv-6.0.0~2790
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8e462c756ebf20bd39885ba64b80af0bcf49a73e;p=apex-tripleo-heat-templates.git

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
---

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