From b9198ad03a824a12e6b5331f1995473257fb0665 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 26 Nov 2013 11:19:40 -0500 Subject: [PATCH] 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 --- overcloud-source.yaml | 2 +- swift-source.yaml | 2 +- undercloud-source.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 3e83684dc0..57a5560ecc 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 a982d2f4bd..14bbf2b98a 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 9dcbf53813..9dca40276f 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: