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

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 3e83684..57a5560 100644 (file)
--- 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 a982d2f..14bbf2b 100644 (file)
--- 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 9dcbf53..9dca402 100644 (file)
--- 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: