Merge "Fix case of OpenStack in templates."

This commit is contained in:
Jenkins 2013-11-27 18:00:15 +00:00 committed by Gerrit Code Review
commit b1b60b2587
3 changed files with 3 additions and 3 deletions

View File

@ -147,7 +147,7 @@ Resources:
InstanceType: '0' InstanceType: '0'
Metadata: Metadata:
OpenStack::Heat::Stack: {} OpenStack::Heat::Stack: {}
Openstack::ImageBuilder::Elements: OpenStack::ImageBuilder::Elements:
- boot-stack - boot-stack
- heat-cfntools - heat-cfntools
- heat-localip - 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: Parameters:
SwiftHashSuffix: SwiftHashSuffix:
Default: unset Default: unset

View File

@ -70,7 +70,7 @@ Resources:
Metadata: Metadata:
OpenStack::Role: undercloudConfig OpenStack::Role: undercloudConfig
OpenStack::Heat::Stack: {} 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: admin-password:
Ref: AdminPassword Ref: AdminPassword
admin-token: admin-token: