aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-02-13Merge "Allow manual hosts entry exports in overcloud."Jenkins2-0/+26
2014-02-13Merge "Add a debian-mirror heat template"Jenkins1-0/+31
2014-02-14Allow manual hosts entry exports in overcloud.Robert Collins2-0/+26
This makes it possible to have SSL connections to APIs from compute hosts with no DNS or external connectivity - something the ci-overcloud has. Change-Id: I089ef8fdfb4a59279f09bf3cd2a4474000e4bfa6
2014-02-12Make it possible to do physical networks for VMs.Robert Collins2-0/+22
This patch makes it possible to setup physical networks for VMs, separate to the control plane configuration which is needed for routed/natted access to physical networks. Future work is needed to automate ci-overcloud configuration of the control plane where we need two distinct bridges, but this is enough to stop folk dying of boredom setting up a sizeable ci-overcloud. Change-Id: I6ac7129f22bb797467adb0408638781d20081f19
2014-02-12Permit overriding the undercloud controller ip.Robert Collins1-10/+15
Currently we infer the controller IP address from Neutron, but when we get HA, the controller address may move around so would need to be the floating IP. Equally, folk doing unusual sets may need to have the IP address be something other than what the seed Neutron handed out. Change-Id: I97441d009b831fd7356a6c58f4c9edc7532f7d05
2014-02-08Drop PowerUserName from overcloud-source.yamlDan Prince1-4/+0
This parameter is only used for underclouds... no need for it here. Change-Id: I8cfda18ef4c9d7aa20fca7f1ba596541c3aad1ac
2014-02-04Support neutron.flat-networks in overclouds.Robert Collins2-0/+12
This is needed to allow configuring the template in I9fa923b63033edb694720bfe5fc756a7c0fbfd2a. Change-Id: I65810db156cb3d93291ac56fcf96e3ed2c87e1b2
2014-02-04Make make overcloud.yaml DTRT always.Robert Collins1-2/+2
Change-Id: I3aebf49c87434026b9eea9de9a67cb3196bc48b2
2014-02-03Merge "Remove InstanceType and ImageId from cinder template"Jenkins1-2/+0
2014-01-31Remove image parameter changing from mergeClint Byrum5-19/+27
The merge tool originally was meant to merge somewhat different things, and thus this was helpful in the early versions. However, at this point we want parameters to be more stable and we don't generally merge things that have their own image parameter. Meanwhile this feature caused problems as we change resource names. This is a backward incompatible change of default behavior, but the old behavior can be had again by passing --change-image-params. Change-Id: I78cf31f0443f3d9f274758f5471a5bca9155635d
2014-01-31Add a debian-mirror heat templateSteve Kowalik1-0/+31
Populate defaults for the debian-mirror image-element using a heat template. Change-Id: I28de1d04be7292dad1bc448ff8bbde634cebd6f3
2014-01-31Remove file injection config option.Robert Collins2-2/+0
We're just forcing it off now that the seed is Neutron based. Change-Id: I3ebc1454aba9d2c2587628f9cded6e0f445f3606
2014-01-31Prep work for a scalable control plane.Robert Collins7-58/+58
This is complete as far as it goes but it isn't enough to make running a scaled out control plane actually work. Specifically, the constructs to point at API hosts based on looking up a network address aren't suirtable for scaled out - we need to be using the virtual IP or DNS round robin or other such resilient configurations, but that is largely / entirely orthogonal to making the template be ready for scaling. Change-Id: Ib9e6db5e7d5db84e4746afdabea046d2b8702bbb
2014-01-31Update overcloud to support N compute hosts.Robert Collins3-16/+25
This uses the new merge feature earlier in this series. Exporting COMPUTESCALE before running make will build a different template. Note that since Make doesn't depend on variable values, you need to delete overcloud.yaml between building with different scales. Change-Id: If05b99ae3596bcc794e3a899ab1443aeb14ec754
2014-01-30Merge "Make scaling out a feature for merge.py."Jenkins5-2/+391
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-28Remove InstanceType and ImageId from cinder templatemarios1-3/+1
InstanceType and ImageId properties belong to an AWS::AutoScaling::LaunchConfiguration, for example as used for NovaCompute0Config in nova-compute-instance.yaml. However this template doesn't use a LaunchConfig but params instead. AFAICT we don't need these here (and they cause HEAT template validation to fail) Change-Id: If444e4449e3d62cb954de48bc3b55b16dcc8886f
2014-01-29Make scaling out a feature for merge.py.Robert Collins5-2/+391
This is a simple implementation designed to work with our current non-HOT approach. We need to adjust our templates a little to support this - though future work could make that better, it's orthogonal to this effort. Change-Id: I555617e5f24a5882de915f057dc02e008c81e753
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