aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2013-11-26 11:19:40 -0500
committerDan Prince <dprince@redhat.com>2013-11-26 11:20:22 -0500
commitb9198ad03a824a12e6b5331f1995473257fb0665 (patch)
tree31bb42d1f866b1088d9cd887f68e13e0dc0ec428
parent38fcc17219bc2457be42e323295784fd0e04747c (diff)
Fix case of OpenStack in templates.
merge.py seems to look for OpenStack::ImageBuilder::Elements But we use Openstack::ImageBuilder::Elements in our templates. Change-Id: I94ee367cf77c3f2929ee23d2dcdd28622849c89e
-rw-r--r--overcloud-source.yaml2
-rw-r--r--swift-source.yaml2
-rw-r--r--undercloud-source.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 3e83684d..57a5560e 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -147,7 +147,7 @@ Resources:
InstanceType: '0'
Metadata:
OpenStack::Heat::Stack: {}
- Openstack::ImageBuilder::Elements:
+ OpenStack::ImageBuilder::Elements:
- boot-stack
- heat-cfntools
- heat-localip
diff --git a/swift-source.yaml b/swift-source.yaml
index a982d2f4..14bbf2b9 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -1,4 +1,4 @@
-Description: 'Swift-common: Openstack object storage common configurations'
+Description: 'Swift-common: OpenStack object storage common configurations'
Parameters:
SwiftHashSuffix:
Default: unset
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 9dcbf538..9dca4027 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -70,7 +70,7 @@ Resources:
Metadata:
OpenStack::Role: notcomputeConfig
OpenStack::Heat::Stack: {}
- Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
+ OpenStack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ]
admin-password:
Ref: AdminPassword
admin-token: