aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-10-14Make LaunchConfiguration resources mergeableRoman Podolyaka5-8/+98
This can be very useful for merging of Metadata to be used by optional services (e. g. to add services like tuskar to undercloud on demand). Change-Id: Ifc4016d6e994064c0772c12e668e98bf055fada9
2013-10-14Hide the AdminToken too.Robert Collins3-0/+3
This is arguably more important than passwords as it allow rooting keystone :). Change-Id: I12d8ae0f096480112a82d7598eedae64a6fbd861
2013-10-14Add metadata for the nova floating-ips extension.Robert Collins1-0/+2
Nova defaults to trying to allocate floating ips from a neutron network called 'nova' but we called our external one ext-net (which various Neutron documentation uses), so we need to override it or the nova floating-ips extension isn't usable [without explicitly setting a pool in the API calls]. Partial-Bug: #1239450 Change-Id: I1ef78642bdc1f19d25422961350e4f02a8f6c16f
2013-10-14Alpha sort the nova and neutron sections.Robert Collins1-14/+14
I'm having a minor OCD moment. Change-Id: I49cdf078d24a38dcdb1f2801764dbcbd6dd10ccf
2013-10-11Add parameters for undercloud power_managers.Dan Prince2-2/+12
Adds a new PowerManager parameter for the baremetal power management driver. Change-Id: I3d3b1f8e190d9de9705b2319726cdddb5624fc83
2013-10-12Permit overriding the default route for neutron.Robert Collins1-0/+6
The intent here is that the undercloud default route will be discard, but the router kept for access to the metadata service, and this specified route will be used for all other traffic. Change-Id: Idf3f8252c4d4be30839d9d08ad7d4ce49538f04e
2013-10-12Allow making the public interface a vlan.Robert Collins1-0/+6
In the CD overcloud we need to use a VLAN for public traffic. Change-Id: I8d674e1ae58063d9be338023819f174d1bc028e4
2013-10-12Make it possible to set the public interface ip.Robert Collins1-0/+7
This is already supported by the ovs agent, but we didn't need it for the emulated overclouds. Now we're working on bare metal, it's needed for some deployments. Change-Id: Ibb41c40d371e4c153a84fd09c370b158add75b81
2013-10-11Make neutron public interface configurable.Robert Collins3-3/+18
Not all machines use eth0 :). Change-Id: I2d0cfd8df46e7eda1b7db2ea5c8e84d3e970c862
2013-10-11Delete unused interfaces.control key.Robert Collins4-14/+0
Change-Id: I3a84cf52cc46f0c338319a046d77edb2a9b29c45
2013-10-10Merge "Remove an unsed target from Makefile"Jenkins1-5/+0
2013-10-10Remove an unsed target from MakefileRoman Podolyaka1-5/+0
notcompute.yaml seems to be unsed for a while, but it's still present in Makefile (its dependencies were removed by change I952c630ca424d114feb643a6c34d182cad660f26). Change-Id: If5d84bd822f748c962cdb2b95b6bbd5d5e1f11fa
2013-10-10Add a waitcondition for signalling stack-up.Robert Collins1-0/+11
Without this we need horrible hacks to detect whether the cloud is ready to use. Change-Id: Ic5c5fd16c6c283d3d339e1f1238d3349d0b93f7c
2013-10-07Merge "Add a bare metal undercloud template."Jenkins1-0/+194
2013-10-01Make test_merge.bash executableDerek Higgins1-0/+0
This is an executable script, lets make it so. Change-Id: Ie8e1196fdd7883447d05e89e001418d284bfcbf3
2013-10-01Add a bare metal undercloud template.Robert Collins1-0/+194
This should be factored into a lib and different includes, but right now - iteration one - we need the thing up and running. Change-Id: I1d0ed1c33385fd66ddfe39440f181dbb9b295fe9
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