aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-01-28Merge "Make debugging merge.py in the test suite possible."Jenkins1-1/+1
2014-01-28Merge "Permit writing output to other than stdout."Jenkins1-1/+8
2014-01-29Make debugging merge.py in the test suite possible.Robert Collins1-1/+1
Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
2014-01-29Permit writing output to other than stdout.Robert Collins1-1/+8
Change-Id: I8349f347578bab564e4c37ee2c87314881e09b01
2014-01-25Allow setting a single NTP ServerClint Byrum1-0/+6
We can allow multiple later when we have better tools for such things. Change-Id: Ie902843c28f8a7258b207745653184784e3e9665 Partial-Bug: #1184486
2014-01-24Merge "Use OS::Heat::UpdateWaitConditionHandle"Jenkins1-1/+1
2014-01-23Merge "Expose bridge_mappings in the overcloud."Jenkins1-1/+7
2014-01-23Expose bridge_mappings in the overcloud.Robert Collins1-1/+7
Some overclouds will want physical networks to be accessible by VMs, and this is a component of that. Change-Id: I5f65c040526f785b4e976f87980d94588b3fb63c
2014-01-22Merge "Add SSL configuration metadata for overclouds."Jenkins2-2/+45
2014-01-20Add license fileDirk Mueller1-0/+202
Change-Id: I6f1807b2c4f3ec8bc0b181015997516c692fafee
2014-01-17Merge "Add optional cinder storage node to overcloud"Jenkins2-0/+72
2014-01-16Use OS::Heat::UpdateWaitConditionHandleClint Byrum1-1/+1
This alternate wait condition handle is used to make updates wait for signals from all parties to signal they're ready. This change will not work until the following Change Id lands in Heat: Ibfadc6f9c436ce3d0f468a4e5560233f762038dd Change-Id: Id11b5c79df5f41e49f1bf3c860e414204a242293
2014-01-17Add SSL configuration metadata for overclouds.Robert Collins2-2/+45
This passes SSL keys in via Heat which places a high cost on heat compromises or the use of a non-SSL heat to do deploys. We'll want to ensure that that is documented clearly. Change-Id: I14d441460116fda91fbd1d2097c5598b57155a6d
2014-01-15Add optional cinder storage node to overcloudRyan Brady2-0/+72
Mergeable block storage yaml template. Makefile updated to create a overcloud-with-block-storage template to deploy an additional machine as a block storage node. Change-Id: I37c06cde114592507a4583f7ec53ffac123d66e3
2014-01-14Merge "Add undercloud-vm-ironic-source yaml file"Jenkins2-1/+22
2014-01-14Merge "Add all and clean targets to makefile"Jenkins1-0/+12
2014-01-14Merge "Avoid echoing comment from makefile recipe"Jenkins1-3/+4
2014-01-14Add all and clean targets to makefileMark McLoughlin1-0/+12
Just for convenience, particularly 'make clean'. Change-Id: Ic9964ace7fb4c675e84b3b9343fc8239abca44ac
2014-01-14Avoid echoing comment from makefile recipeMark McLoughlin1-3/+4
We include a comment to explain why nova-compute-instance.yaml is included in the prerequisite list for overcloud.yaml, but this comment gets echoed by make before it executes the recipe using a shell. $> make overcloud.yaml # overcloud-source.yaml [..] won't work here because [..] # a prerequisite but don't want to pass it into merge.py python ./tripleo_heat_merge/merge.py overcloud-source.yaml [..] mv overcloud.yaml.tmp overcloud.yaml Instead, maintain a list of files included by overcloud.yaml in a variable and put a comment above that. Change-Id: I1af69fbb33e1833170f086aec9b54c5c4e57138f
2014-01-13Add a wait condition to undercloud stackRoman Podoliaka1-0/+11
Using of Heat wait conditions allows us to reliably reason when a stack creation is complete (as the completion handle is triggered when os-refresh-config completes). Change-Id: I89725143532177a0b4aea23c1c31bc7737da0896
2014-01-10Add undercloud-vm-ironic-source yaml fileDevananda van der Veen2-1/+22
Copies the undercloud-vm-source yaml file and removes portions which were particular to nova-baremetal, replacing them and paving the way for further Ironic-specific changes. Change-Id: Ied49b0f8018291a0851cf2e10d83a174cb180479
2014-01-08Merge "Add Ceilometer parameters for the overcloud"Jenkins2-0/+43
2014-01-06Configure undercloud to use ext4 ephemeral FSClint Byrum2-0/+2
Ext4 is significantly more efficient when being created, and we do not need to support older OS's or platforms that do not support ext4. This will be ineffective until the change to the nova element lands, but it is harmless to land this first. That change is referenced by this Gerrit change ID in tripleo-image-elements: Ic754f3b342b632a6919d4ad1b808627ec9fa4308 Closes-Bug: #1266262 Change-Id: Icca5fd94ca230141818ee9adb416f6f062869c6b
2014-01-02Add Ceilometer parameters for the overcloudTomas Sedovic2-0/+43
Change-Id: I205bb2c0bb7c9b956fd3e0d6b266bdf5afb48864
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