aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-03-10Swift storage heat templatesRichard Su3-11/+149
Updated the existing swift-source template to properly list all swift devices. Created a new swift-storage-source template to add additional swift-storage only nodes. The default SWIFTSTORAGESCALE is 0. Change this number to add additional swift storage nodes. Change-Id: Ia05f4ad44593316430d60541106d23b032c3e760
2014-03-07Adds block-storage-nfs templateRyan Brady4-6/+103
To support the changes to the cinder element to allow the nfs backend to be utilized, this template has been added to show the usage of the nfs_shares key in the cinder metadata. The value is a list of strings containing share addresses. This change is added to facilitate an example to test the cinder element change: https://review.openstack.org/#/c/74563/ You may setup the nfs server manually or use the nfs-server element at https://review.openstack.org/#/c/74712/. Change-Id: I5b6cb118b34421ea07a81ed1fe68db24b1d4f19d
2014-03-06Merge "Fix Merge::Map for scatter-gather in Configs."Jenkins2-1/+138
2014-03-06Merge "Add a check target."Jenkins1-1/+3
2014-03-05Fix bad indentationJames Slagle1-4/+4
Lines for notifier-strategy and log-file had 1 level too much of identation causing an error in the available metadata. Change-Id: I559855887349bf2bbab87788ef9baa216bde60d8
2014-03-06Fix Merge::Map for scatter-gather in Configs.Robert Collins2-1/+138
When Merge::Map was used like so: NovaCompute0Config: Merge::Map: NovaCompute0: Fn:.... We were adjusting the inner NovaCompute0 to the current scaling loop position rather than exploding it out as part of the map. For now, we want maps to be global in context so the fix is fortunately simple. Change-Id: Ibea723d4c763f593d934a9d2acfd31ce369f6408
2014-03-06Add a check target.Robert Collins1-1/+3
Just developer convenience - I'm used to autotools 'make check' environments. Change-Id: Idf5bb882f798d22d4513756b5273d4ae19caa5c0
2014-03-05Merge "Add GlanceLogFile and GlanceNotifierStrategy"Jenkins3-0/+36
2014-03-05Merge "Make Wait Conditions depend on config creation"Jenkins2-2/+2
2014-02-26Make Wait Conditions depend on config creationClint Byrum2-2/+2
Currently our wait conditions are racing with Heat resolving configurations. There should be plenty of time but sometimes Heat may be dealing with a temporarily problematic Nova API and spinning on that. While that is happening, the in-instance tools will not have their full configuration available to them. We don't want the wait condition timeout to start until the box has had its actual config exposed to it. Change-Id: I0eab8fe7547d3cbcebb1559fd3d06206b1750e96
2014-02-26Add GlanceLogFile and GlanceNotifierStrategyJames Slagle3-0/+36
Expose 2 new parameters to control glance configuration: - GlanceLogFile - GlanceNotifierStrategy This will allow the glance configuration options log_file and notifier_strategy to be set in glance-api.conf and glance-registry.conf Change-Id: I1af1ecfdfe0859f2baba4579aab6e947a2a54308
2014-02-25Different Flavors for Tuskar rolesLadislav Smola3-6/+14
- different Flavors for control, compute and storage nodes - for devtest use, they default to 'baremetal', so nothing changes - for Tuskar, there is a possibility to have them different for every role Change-Id: I8c1b80f55a91c7a7fd5e560ccdb8da82ec374084
2014-02-21Fix the hosts setting - nova uses novalocal.Robert Collins1-1/+1
Not '.local'. Doh. Change-Id: I61ac6e5d6dfefcfe8c78618f6fc5d4c2c61831f0
2014-02-21Gather all hypervisor names into /etc/hosts.Robert Collins1-9/+39
Nova compute uses hostnames to do live migration, so we need this, or DNS, and for now this is simpler, as we don't have Designate available in the undercloud. Change-Id: Idf0b106c5fbe60680b23a730eb37619a3d796869
2014-02-21Add a Merge::Map feature.Robert Collins5-0/+367
We need to scatter gather in a few situations - determining rabbit cluster membership, galera membership and configuring hosts for Nova to permit live migration (which requires host->host communication). This patch is a proof of concept for an eventual heat feature, expressed in merge.py. The example given should work for actual use, but I'll deliver that change separately. Change-Id: I68e9b2471866810cc698ca3ea28ddf5bb1688d7b
2014-02-21Fix tests.Robert Collins1-0/+3
We're not gating yet - this skew crept in. Change-Id: I97b064f6d0cb75bf80b423951101687b6d26d90c
2014-02-20Remove uses of functions in parameter defaultsClint Byrum3-43/+52
This doesn't work in recent versions of Heat and it shouldn't really have ever worked. Change-Id: I60772173f8d5baa5768b5626266b2e61cd93fbe2 Closes-Bug: #1282594
2014-02-17Add username parameter for rabbitRichard Su8-4/+46
Username is currently assumed to be guest in the configuration files. This change makes it more explicit. Configuration files in tripleo-image-elements will be updated to use this parameter in an upcoming patch. Change-Id: Ia176f4d573a3a293560c72236a4181befa678301
2014-02-13Fix typo in undercloud-vm-source.yamlDerek Higgins1-1/+2
There is no NoEcho type. Change-Id: Id652b80f394a0d0b9e4b83ca9a61d2b547a14c3e
2014-02-13Merge "Support TripleO-CI for overcloud builds."Jenkins1-2/+11
2014-02-13Merge "Allow manual hosts entry exports in overcloud."Jenkins2-0/+26
2014-02-13Support TripleO-CI for overcloud builds.Robert Collins1-2/+11
For Tripleo-CI we can't generate the key in the VM and hand it out, because we have restricted access to the machine. Plus, this has been ugly forever. Pass an SSH key in, rather than pulling one out. Change-Id: I1def0757758e30e63891ff099106dac158bd8d83
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