aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-10-01Make test_merge.bash executableDerek Higgins1-0/+0
This is an executable script, lets make it so. Change-Id: Ie8e1196fdd7883447d05e89e001418d284bfcbf3
2013-09-30Add recursive whole-file __include__ tagClint Byrum6-2/+84
We can now merge an entire file with minimal effort. Change-Id: If86657fb9f9cca0f048c9e01100a3667597a6596
2013-09-30Merge "Make it possible to enable native neutron PXE."Jenkins1-0/+6
2013-09-27Merge "Set the undercloud host name to 'undercloud'."Jenkins1-1/+1
2013-09-26Set the undercloud host name to 'undercloud'.Dan Prince1-1/+1
This makes more sense than calling it 'ubuntu'. Note: This will require an associated incubator change which I will push momentarily. Change-Id: I166b45a6ceb34635ed5ef7e29dd028f8c6a4cbe3
2013-09-26Make it possible to enable native neutron PXE.Robert Collins1-0/+6
This is used to control the dhcp_options_enabled flag in nova.conf, needed to enable PXE orchestration (until Nova assumes all Neutron libraries and servers support it). Change-Id: I035a2341d829a9987eeeebdd9c22f039e69489db
2013-09-25Refactor test_merge.bash for multiple testsClint Byrum2-16/+23
We will be adding more tests, so make it more of a framework for that. Also fix up minor lib.yaml formatting bug. Change-Id: Ic0fe1679f8d62680dfd0acf215c849aa38b913da
2013-09-19Add functional tests and examples for mergeClint Byrum7-1/+86
merge.py is undocumented and untested, which is undesirable, as it does not seem to be going away any time soon. Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
2013-09-19Provide Neutron password in compute metadataRoman Podolyaka1-0/+2
overcloud compute node makes requests to Neutron API and requires quantum_admin_password option of nova.conf to be set (it is defined in nova image element like quantum_admin_password={{neutron.service-password}}). Without this, booting of a user instance in overcloud fails, because nova-compute service can't authorize requests to Neutron API. Change-Id: Ie726d0c3d54abc6c24a45fde3f5af03fd2cf9e37
2013-09-17Set NoEcho: true for parameters containing secretsSteve Baker7-0/+32
This prevents secret values being returned for stack-show. Change-Id: I82eff26fda31511b66c6371f6ded2a5fb559f3fb Fixes-Bug: #1226730
2013-09-17Finish correcting all OS::Nova::Server referencesClint Byrum3-18/+35
Some references to first_private_address were missed and some of the Fn::Select calls were only half-completed. Change-Id: I92a4e5e67784e5d64ec6e44ddcac55762cde81eb
2013-09-17Replace broken usage of first_private_addressClint Byrum2-33/+63
The OpenStack native OS::Nova::Server gives us the full list of networks rather than AWS::EC2::Instance's contrived view of 'private' and 'public'. We know we want ctlplane, and use Fn::Select to choose that network directly. The outer Fn::Select is meant to choose the first network every time, which may not always be correct, but is at this point. Change-Id: Iae54ab8d9ac8d84f4f6e2f86ac1b66aacb687473
2013-09-17Allow customising the Nova BM architecture.Robert Collins1-1/+6
Nova BM can only run one architecture at a time, and the incubator currently documents running sed against undercloud-vm.yaml! Change-Id: Ib157cf405a40fa983f1df3fb3ed62d04262e3e81
2013-09-16Update PrivateIp to first_private_address.James Slagle4-23/+23
Update the PrivateIp attribute to first_private_address as a result of the change to the OS::Nova::Server type. Change-Id: Id90f8c7c4e0217e1f94d3e5134744a810390e7b7
2013-09-14Make Heat service password configurable.Robert Collins2-2/+12
So that it can be a snowflake! (unique). Change-Id: Ic823620ace7df5636cd9ff16dcd7476654692e6c
2013-09-14Remove unused swift undercloud definition.Robert Collins1-3/+0
The undercloud doesn't contain swift. Change-Id: I1372ed28d7ee5bec2b0e03941bd8d50a0b749825
2013-09-14Get rid of global service-password.Robert Collins3-9/+5
No longer needed, less globals == win. Change-Id: I2872e5a8775a09b2e857ef082f3b86109785a126
2013-09-14Add Nova service password.Robert Collins3-0/+18
Another service converted to match the keystone model of unique accounts per service. Change-Id: I62fce289a7032138be3aca8c74df499c2b1fde28
2013-09-14Add Glance service password.Robert Collins2-0/+12
The in-instance scripts are about to require this. Change-Id: I0260da5502639acc60b2791e9f957952f7ab5956
2013-09-14Add cinder service-password.Robert Collins1-0/+6
The instance config is about to require this. Change-Id: Ia778a7f5926b54758e73a4ee0940ef42fe5be6a9
2013-09-14Remove trailing whitespace.Robert Collins1-1/+1
Change-Id: Ifde42d405e22c32f4edc2fdd4f5aed5a0c8bff20
2013-09-13Remove unmaintained individual service templatesClint Byrum10-838/+0
First rule in the zombie apocalypse: Burn the dead. Change-Id: I952c630ca424d114feb643a6c34d182cad660f26
2013-09-13Use native server resource in overcloudClint Byrum1-6/+6
Change-Id: I4745627508e8b6b687fc17527cdd3c41d09b0d80
2013-09-13Use native resource for nova-compute-instanceClint Byrum1-5/+5
Change-Id: I347465b32578467ca3d9f55ea2994d832fcd8b3f
2013-09-13Update undercloud-vm.yaml to use OS::Nova::ServerClint Byrum1-7/+6
Change-Id: I34c294c62bf5da4c01d72931173c055c6a13706c
2013-09-13Add support for merging OS::Nova::ServerClint Byrum1-4/+10
Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d
2013-09-13escription -> DescriptionRobert Collins1-1/+1
Change-Id: Iec40d309f3099998fbeb85de7538ed5e0d2e9c42
2013-09-13Add in Neutron service password.Robert Collins2-0/+12
The in-instance scripts are being fixed to not confuse the admin password with the neutron service password. Change-Id: I341574bb838a9563120791b9ac014d75274a96aa
2013-09-12Make admin-password configurable.Robert Collins2-2/+12
We use the admin password in in-instance scripts that configure e.g. nagios from the cloud metadata, but production clouds will all have unique passwords - it has to be a parameter. Change-Id: I1f6c697ce27580fd669c7623e7fcea4c96ec62d0
2013-09-11Make the keystone admin token configurable.Robert Collins2-2/+12
Because unique is good for auth secrets. Change-Id: Iaadc102d11d68d7fc059e62bd992de7ee6f2c818
2013-08-17Update stackforge references to openstackMonty Taylor2-2/+2
Change-Id: I3f1cc6ab666045257d5ef6afc3fd26c59d90e57b
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