summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
AgeCommit message (Collapse)AuthorFilesLines
2013-08-14Load local IP using separate post-boot Metadata.Clint Byrum1-13/+73
Previously we could not feed the IP of an instance into its own Metadata because of circular dependency problems. 0.0.0.0 was used with the heat-localip element to work around this problem. This caused problems though, as heat-localip would edit the source local heat metadata, which would make cfn-hup and/or os-collect-config think that the Metadata had changed, causing it to restart everything every time we query the Metadata, which was about every five minutes. Now we can just query this inert LaunchConfiguration resource to get its' Metadata once it is ready. This resource will only change when legitimate things are changed in the stack, and so we won't restart everything every five minutes anymore. Note that when the native Heat DSL lands, the OS::Heat::SoftwareConfig resource is meant for exactly this purpose. After this is merged we no longer need the heat-localip element. Fixes bug #1202322 Change-Id: Id06323ba43203570eeebfa5b3d03fa56c16c0c10
2013-08-14Migrate from cfn-hup to os-collect-configClint Byrum1-13/+11
Os-collect-config is meant to replace cfn-hup from heat-cfntools. It allows pulling from multiple metadata sources and runs continuously. Fixes bug #1211289 Change-Id: Ia4e9127fb79048bd1022b32a37272f8463a774ae
2013-08-14Make Resource names suitable for merge/includeClint Byrum1-1/+16
In nova-compute-instance.yaml, we need to use resource names that are unique within the entire set of resources that may be merged or included. However, we need the instance resource name to _match_ the one in overcloud-source.yaml so that its own access policies can function. Without this change we will not have unique users and Metadata access keys/policies for compute and controller. Change-Id: Iebde7e6adede4984f4f693cf2d57b6fadb8be558
2013-08-14Fix missing NovaComputeLibvirtType parameter.Clint Byrum1-0/+3
Also change default to '' as null is not technically allowed as a string default in cloudformation (Heat accidentally allows this). Os-apply-config, via pystache, will still treat this as false for the purposes of checking if it is set or not. Change-Id: Ia02dbcf619bdc92647f1d21157fa4a8e3f749de3
2013-08-12Set a physical bridge for network nodes.Robert Collins1-0/+1
The overcloud control plane needs to bring up an ovs bridge for the ovs plugin hot-plugging and floating ip logic to work. The previous in-instance script didn't migrate IP address and route information. We can do that by using the core ovs script we wrote for baremetal setups - triggered by setting the physical interface parameter. Change-Id: I6d6b09140ee751371607c0963dc76cc5b95f7674
2013-08-12Remove unused network configuration metadata.Robert Collins1-6/+2
This is supplied to neutron etc via API calls - having it in Heat leads to having redundancy, confusion and tricky scripts. Incubator now has scripts to configure this and instances won't consult these keys. Change-Id: Ia45d9bf5bb326ec88f9f4a48c5520570cf5b6d72
2013-07-12overcloud-source: Fix overcloud parameters.Clint Byrum1-3/+2
These values were missed in the initial overcloud-source.yaml. nova.metadata-proxy is required to allow vms to communicate with the EC2-style metadata service. quantum.ovs.fixed_range constraints DHCP allocation for the undercloud, but in the overcloud we do not want this constraint because the individual subnets we define will do that. quantum.ovs.ovs_range configures the range of ips that can be assigned to the tenant subnets. Change-Id: If7191fa8baf1209ae33b9e8200f52ea0ade97810
2013-07-10Provide values for all nova compute params needed.Clint Byrum1-17/+15
Previously these would have to be set for overcloud at runtime, but we have good sane defaults now, and for nova-compute-instance we are able to feed them in using the appropriate references with Fn::GetAtt. Change-Id: Idfff2885bf2afa58b2dec84f06639198e411eae2
2013-07-10Add an example of Type: FileInclude.Clint Byrum1-0/+140
Change-Id: Ie9d45ea5e26e38e8782e7a3d0a626e36090f5388