summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2013-08-14 17:54:34 -0700
committerClint Byrum <clint@fewbar.com>2013-08-14 18:39:57 -0700
commit2334a8f0b2526aace63c74a7f58a5a8060d29487 (patch)
tree32777ce69363f9202b60859ffd3543577eba6ee7
parent5e069fece4f9127265ef2e5d0a6df78a1bcdb145 (diff)
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
-rw-r--r--nova-compute-instance.yaml2
-rw-r--r--overcloud-source.yaml3
2 files changed, 4 insertions, 1 deletions
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