aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-12-17Make merge.py installable as a package using pbrmarios6-14/+19
Now that merge.py is invokable from another script (Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that review, it makes sense to offer a nicer way to consume the merge functionality. Once you git clone tripleo-heat-templates you can python setup.py install and get /usr/bin/tripleo_heat_merge as well as a tripleo_heat_merge package in python2.7/site-packages. Makefile edits required because we moved merge.py into the tripleo_heat_merge directory for the packaging. Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
2013-12-17Permit setting overcloud image update policies.Robert Collins2-0/+12
This is the first step towards preserving state on stack updates when the image id has changed. I chose REPLACE as the default value because that is the current behaviour and we can override it from the command line. Change-Id: I64eab51892922ab51a89a9f389457fd1ed979fb2
2013-12-16Adds included-template-dir param for resolving template FileIncludesmarios1-9/+11
In I587fa7a826f93f89e8e5c266af7f5765438fe738 there is a problem with the overcloud.yaml Make target. Once the merge.py script is moved from where the templates are, FileInclude paths cannot be resolved relative to the script. The included-template-path defaults to './' Change-Id: I220c5e52d8062e98aa28a1c582e29c7e844bc9ae
2013-11-29Make merge.py invokable from another scriptmarios1-132/+146
Until now this script has been used at the command line. Tuskar would like to consume the merge.py functionality to generate the overcloud heat stack template. A main() is thus added here as well as a few related nits like ensuring paths are absolute for included files. The actual merge functionality is split into its own method so it can be invoked more cleanly from calling scripts. The main method is then used at the command line as before For more info about how this will all be used by Tuskar see I578b4e9f238590ea245b827bc75d252568d194fe Change-Id: Ia6b6416fe10358d23f2b120283eecaf4c1178cfd
2013-11-27Merge "Fix case of OpenStack in templates."Jenkins3-3/+3
2013-11-26Fix case of OpenStack in templates.Dan Prince3-3/+3
merge.py seems to look for OpenStack::ImageBuilder::Elements But we use Openstack::ImageBuilder::Elements in our templates. Change-Id: I94ee367cf77c3f2929ee23d2dcdd28622849c89e
2013-11-26Name the undercloud resources with 'undercloud'.Dan Prince5-14/+14
Using notcompute for the undercloud resources is a bit confusing so lets rename them accordingly. This change shouldn't effect the devtest scripts or toci because we don't pass a parameter in for the undercloud. Change-Id: I33c28a3554fe117c5a0a6e641ea277f7a95f2b35
2013-11-25Wait for o-r-c on nova compute as well.Clint Byrum2-1/+12
We have seen situations where nova-compute is not ready when notcompute has run its waitcondition. That leads to errors while we fail to boot instances until there is at least one nova compute available. We also update nova-compute-instance.yaml so that it continues to work stand-alone. Change-Id: Iadea7a34e2cd4576cc78659b99c12e1041af5b45
2013-11-25Use merge.py for the undercloud templates.Dan Prince6-239/+89
This will require some changes to our devtest scripts and TOCI to ensure we build the overcloud-vm template before attempting to use it. Change-Id: I14b5e4a0ccf5f18429bfc33e527bdb4760b8d1a3
2013-11-20enable Ironic password for keystone authChris Krelle1-2/+6
The current version of the ironic-source.yaml uses AdminPassword, it should use the ironic users password and not the admin user password. The patch corrects an authentication error by adding IronicPassword to ironic-source.yaml file. Change-Id: Idbe4950bb3026e2201ddfddc4b58c2bf98972be9
2013-11-18Add metadata to configure swiftDerek Higgins6-5/+45
o Adds the required swift metadata (in swift-source.yaml). o Sets up glance to use the swift backend on the overcloud. o Sets up glance to use the file backend on the undercloud and seed, i.e. maintain the Status quo. Change-Id: I4a70ffbf9c51f1fea5cfc84d8718d3d30d36b3f2
2013-11-07Merge "Drop NeutronNativePXE option from undercloud tmpls"Jenkins2-12/+0
2013-11-06Drop NeutronNativePXE option from undercloud tmplsDan Prince2-12/+0
Depends on https://review.openstack.org/55338 We now just want to default to using Neutron native PXE. Change-Id: Idec46638b88d7c050e721588e5dbddf233d02493
2013-11-05Fix KeystoneURLImre Farkas1-6/+10
Currently KeystoneURL reports back the noncompute instance IP, not the proper API endpoint for the Keystone service. Change-Id: If121620ec549d33f81522465f72e501b7723dd7d
2013-10-29Rename heat_watch_server_url to watch_server_urlDerek Higgins3-3/+3
The other *_server_url parameters are not prefixed with heat_ and this is already in the heat namespace. Change-Id: I24effcfedccb7b69b4e4d022db6676da51083401
2013-10-24Merge "Add Ironic-source.yaml"Jenkins2-0/+14
2013-10-23Merge "Disable nova bm file injection in undercloud"Jenkins2-0/+2
2013-10-23Add Ironic-source.yamlChris Krelle2-0/+14
Mergeable Ironic yaml template. Makefile updated to create a undercloud-vm-ironic template. This patch will allow Ironic developers to include Ironic in the undercloud vm. Change-Id: Ie3998336a12f3509742634e59de5c9bee922d579
2013-10-23Disable nova bm file injection in undercloudRoman Podolyaka2-0/+2
We are now relying on host routes feature of neutron-dhcp-agent, so it's time to disable nova bm file injection in undercloud and use neutron-dhcp-agent instead (if file injection is enabled the static route for metadata server is not set and overcloud machines hit seed vm metadata server instead of undercloud one). Co-Authored-By: Derek Higgins <derekh@redhat.com> Partial-Bug: #1241042 Change-Id: I04a7fb0399031cbf475a427cceac080296f9bc8d
2013-10-23Merge "Add KeystoneURL to Outputs section"Jenkins1-0/+11
2013-10-22Add release configuration.Chris Jones7-0/+61
We can now release through openstack.org infrastructure. Change-Id: I6dff6ae4a97db15bdc4ce419e46e9a125bec277c
2013-10-22Add KeystoneURL to Outputs sectionImre Farkas1-0/+11
Having the KeystoneURL accessible in Heat allows the user to access the overcloud services using the service catalog. Change-Id: Ie6ef1aadf2f027d0b0793fea59385832c9f0c25f
2013-10-16Merge "Add tuskar API service configuration"Jenkins3-0/+26
2013-10-15Move os-collect-config sectionDerek Higgins1-11/+11
All these sections are in alphabetical order except this one. Change-Id: Id0586b5ba11e3c00e36397c7e2cd46e0c8cae292
2013-10-14Add tuskar API service configurationRoman Podolyaka3-0/+26
Needed for I1d16e535ae50a06a8792e1613bb6b6c4647bf128 to work properly. Change-Id: Ib66e688bd7500f03dea7d4282607cd51078e9a51
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