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
This commit is contained in:
Dan Prince 2013-11-26 11:19:40 -05:00
parent 38fcc17219
commit b9198ad03a
3 changed files with 3 additions and 3 deletions

View File

@ -147,7 +147,7 @@ Resources:
InstanceType: '0'
Metadata:
OpenStack::Heat::Stack: {}
Openstack::ImageBuilder::Elements:
OpenStack::ImageBuilder::Elements:
- boot-stack
- heat-cfntools
- heat-localip

View File

@ -1,4 +1,4 @@
Description: 'Swift-common: Openstack object storage common configurations'
Description: 'Swift-common: OpenStack object storage common configurations'
Parameters:
SwiftHashSuffix:
Default: unset

View File

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