From: Jenkins Date: Wed, 27 Nov 2013 18:00:15 +0000 (+0000) Subject: Merge "Fix case of OpenStack in templates." X-Git-Tag: opnfv-6.0.0~2910 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b1b60b258706137ce6c28d1bc03f5b19b044f289;p=apex-tripleo-heat-templates.git Merge "Fix case of OpenStack in templates." --- b1b60b258706137ce6c28d1bc03f5b19b044f289 diff --cc undercloud-source.yaml index f017f62a,9dca4027..35a017e6 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@@ -68,9 -68,9 +68,9 @@@ Resources ImageId: '0' InstanceType: foo Metadata: - OpenStack::Role: notcomputeConfig + OpenStack::Role: undercloudConfig 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: