From: Clint Byrum <clint@fewbar.com>
Date: Thu, 15 Aug 2013 00:54:34 +0000 (-0700)
Subject: Fix missing NovaComputeLibvirtType parameter.
X-Git-Tag: opnfv-6.0.0~2972
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2334a8f0b2526aace63c74a7f58a5a8060d29487;p=apex-tripleo-heat-templates.git

Fix missing NovaComputeLibvirtType parameter.

Also change default to '' as null is not technically allowed as a
string default in cloudformation (Heat accidentally allows this).
Os-apply-config, via pystache, will still treat this as false for
the purposes of checking if it is set or not.

Change-Id: Ia02dbcf619bdc92647f1d21157fa4a8e3f749de3
---

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 316ae585..be15e724 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -31,7 +31,7 @@ Parameters:
     Default: libvirt.LibvirtDriver
   NovaComputeLibvirtType:
     Type: String
-    Default: null
+    Default: ''
   NovaApiHost:
     Type: String
   GlanceHost:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index ff15c3ad..52e2b33f 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -13,6 +13,9 @@ Parameters:
   NovaComputeDriver:
     Default: libvirt.LibvirtDriver
     Type: String
+  NovaComputeLibvirtType:
+    Default: ''
+    Type: String
   NovaImage:
     Type: String
     Default: overcloud-compute