summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-08-15Migrate nova-compute-instance to split Metadata.Clint Byrum2-4/+26
The file was using the old 0.0.0.0 method from heat-localip, but it was missed when converting the other templates to a split Metadata approach to enable a machine to know its own IP. Change-Id: I0b117de12416a52950b1c7079f659df8649d67f9
2013-08-15Correct os-collect-config.cfn.path to be string.Clint Byrum1-1/+1
Specified as a list, it gets translated literally into ["NovaCompute0"] in /etc/os-collect-config.conf. This is not desirable and results in 500 errors because ["NovaCompute0"] does not exist. Change-Id: I7dc01937d73c0c0e5cea70f5a3202d0e43c4caed
2013-08-14Load local IP using separate post-boot Metadata.Clint Byrum2-20/+116
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 Byrum3-35/+29
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 Byrum2-11/+26
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 Byrum2-1/+4
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-12Add ability to set overcloud hypervisor type.Robert Collins1-0/+4
This is needed for non-nested-kvm capable environments. Change-Id: I2b87071941c04d3c99a687082db42d2a84f481fd
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 Collins2-9/+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-08-12Ignore built files.Robert Collins1-0/+3
We don't want someone accidentally committing them. Change-Id: Iec4df61d3b7b1e1bd30f4cbba6b9991062758101
2013-08-12Increase PXE deploy timeout.Robert Collins1-2/+2
Several users with slightly older hardware report the PXE deploy process aborting deploys that were progressing fine. By increasing the default PXE deploy timeout we should cater for this. A separate bug has been filed in Nova/Ironic about the timeout being too simple. Change-Id: I9e340fc7f928b32b1146ce758cda7180888d6cc9
2013-08-08Fixed merge code populating properties from yaml.divakar-padiyar-nandavar1-1/+2
Fixed merge code populating properties from yaml files which was setting only Type attribute for certain attribues related to Image For example, default value for notcomputeImage is populated properly in overcloud.yaml Fixes bug #1202884 Change-Id: I9ea270dd19e9ebdb997be5d07b04ee2df28e3721
2013-07-16Merge "overcloud-source: Fix overcloud parameters."Jenkins1-3/+2
2013-07-15Reinstate architecture binding for nova-bm.Robert Collins1-0/+1
Per bug 1201656 (which this doesn't fix) nova-compute can only run one bm arch from a single compute host. Change-Id: I0eabe6e85ed388af111ef503882dfdf7959d8d97
2013-07-15Stop passing no longer honoured keys in.Robert Collins1-3/+0
The undercloud (and boot-stack in general) no longer create baremetal flavors or register baremetal ramdisks, so passing in keys for that isn't needed. Change-Id: I8c20e95f3a57418d7ae160a296a092cd71254e3d
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-10Generate overcloud.yaml using overcloud-source.Clint Byrum1-2/+2
This new version does not need any nested stacks and correctly references notcompute. Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45
2013-07-10Add an example of Type: FileInclude.Clint Byrum1-0/+140
Change-Id: Ie9d45ea5e26e38e8782e7a3d0a626e36090f5388
2013-07-10Add handling of parameter replacements.Clint Byrum1-0/+21
We will need to replace the use of Parameters in the included template with actual values in many cases. Change-Id: I95fc9116dc2bba74c31d5570851c5c4eb476291a
2013-07-10Add FileInclude special type.Clint Byrum1-0/+7
We need to be able to combine pieces without uploading bits to an accessible URL. Change-Id: If0cec8ce7c77fed786d54dd0af2eb7823c088920
2013-07-10Quantum -> Neutron renameDerek Higgins9-55/+55
Almost all references to quantum have been changed neutron in tripleo-image-elements. Change-Id: Ib17353d5834dd95d0348f62111074180c6e47181
2013-07-10Update boot-stack vm image for overcloud use.Robert Collins1-1/+1
We now have an undercloud specific template, so we can use bootstack-vm specifically for the overcloud control plane. Change-Id: I06eb2b1d00e4d2211b632a06880aed51f01762ff
2013-07-10Set a default image name for compute nodes.Robert Collins2-0/+2
Defaults that match devtest.md will make adoption easier. Change-Id: I6b8c2b13cada5454ff52681451f9124b67ea44a9
2013-07-10Make merge.py output deterministic.Robert Collins1-4/+4
The current code uses dictionary sort order which is defined as being an undefined order. Since humans review .yaml files having them sorted is a good thing. Change-Id: I43a31530bc042750448ac904c0c22f9a59b09b4d
2013-07-10Refine the Makefile rules.Robert Collins1-2/+3
The make rules in use were duplicative, which leads to maintenance headaches. Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3
2013-07-09Update bootstack-vm to match undercloud.Clint Byrum2-17/+27
Also add Makefile stanza to produce overcoud.yaml from bootstack-vm and nova-compute-group. This should allow independent usage of nova-compute-group without having to manually update overcloud. Change-Id: Id2bd20596e6be887b55019fdad31e6b0f4762eb7
2013-07-09Update nova-compute-instance URL.Clint Byrum1-1/+1
Heat must download nested stack templates from a static URL. We have chosen a reasonable default, the official repository for tripleo-heat-templates. Change-Id: I9f8f1f3d3ec6492cf3891fab4fe793e05e703eb5
2013-07-08Merge "Update undercloud-vm for new networking config."Jenkins1-6/+4
2013-07-06Update nagios3.yaml to reflect changes to the postfix element.Chris Krelle1-1/+20
Recent changes to the postfix element added new parameters so the nagios3 template needed to updated to ensure postfix works as expected. Change-Id: I0a9eb8e0988470888f35adcc426ccd314f93b301 Authored-by: Chris Krelle <nobodycam@gmail.com>
2013-07-06Update undercloud-vm for new networking config.Robert Collins1-6/+4
It is currently broken due to mismatched config keys. Change-Id: If3ce934730cb974af7bcd7c6b3134e499f4e2a0d
2013-07-03Remove reference to KeystoneLaunchDerek Higgins1-1/+1
This resource was remove in 6504e6bd09b8b3b14ce56490ea3e17daf8cc0a93 "Simplify keystone into one instance." Change-Id: Iea1502e4f00539abc4b8d04ea37e55c2133f7ae7
2013-06-27A template for dev-test underclouds.Robert Collins1-0/+129
Change-Id: Ibf59b34341129712c0e3187aa87ac90c092a74a7
2013-06-27Ignore editor files.Robert Collins1-0/+3
Change-Id: I2bf716cae119ccc8a4b4fa6fae4caa7444156526
2013-06-20Fixup https://review.openstack.org/#/c/33308.Robert Collins2-3/+3
The local_ip value of 127.0.0.1 breaks clusters. Using 0.0.0.0 will have the right value when the heat-localip element is used. Change-Id: Id0da5d46c60e808944a40bcaf05f1072be55eed7
2013-06-19Merge "Remove references to Fn::GetAtt."Jenkins2-6/+3
2013-06-19Remove references to Fn::GetAtt.Derek Higgins2-6/+3
These were causing a Circular dependency error during the creation of a stack. Change-Id: Iccdf4a081f38aa3a5fe0e250b9e9382958a0f26e
2013-06-19Merge "Fix default mysql usernames."Jenkins1-3/+3
2013-06-19Merge "Adding floatingip_start and floatingip_end to heat template."Jenkins1-0/+2
2013-06-19Merge "Add sample template for nagios3 element."Jenkins1-0/+81
2013-06-19Fix default mysql usernames.Derek Higgins1-3/+3
Username heat looks like it got copy and pasted. Change-Id: I40666b8e80df7424e223b317ab4c9d6f614c43e6
2013-06-19Adding floatingip_start and floatingip_end to heat template.Derek Higgins1-0/+2
These are needed by the quantum-network-node element Change-Id: Ic89b7f25752778aa2145768152bbc6e634ea3e5f
2013-06-18Add sample template for nagios3 element.Chris Krelle1-0/+81
Change-Id: I02a80a371a8ca493f4e143def82215f33b29ac6c Authored-by: Chris Krelle <nobodycam@gmail.com>
2013-06-12Parameterise more settings for nova and quantum.Robert Collins1-4/+12
Change-Id: Ia35431302848666ad013adaeae1d06482cd3117a
2013-06-12Add .gitreview setup.Robert Collins1-0/+4
Change-Id: I22855e7f3c77984ffc81ebf00e62cb78839e63a7
2013-06-06Nested stack of nova-compute-instance.yamlClint Byrum2-0/+78
2013-06-06New single instance nova-compute.Clint Byrum1-0/+83
2013-06-06Adding bootstack-vm template.Clint Byrum1-0/+100
2013-06-06PrivateIp is not assigned yet, plus 127.0.0.1 will work fineClint Byrum1-3/+3
2013-06-06Fixed the nova-compute template.Cody A.W. Somerville1-4/+8