aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-03-26Drop dnsmasq_range from the undercloud source.Dan Prince1-1/+0
We don't make use of dnsmasq_range anywhere so lets remove it. Change-Id: Id3e14aee8a9f720a09bc2c8ace99e06c4a2d09a9
2014-03-26Merge "Remove unnecessary cinder metadata"Jenkins2-2/+0
2014-03-26Merge "Adding image update policy to undercloud template"Jenkins1-0/+7
2014-03-25Fix Ironic templatesRobert Collins3-15/+16
The merge of ironic-source wasn't actually merging, leading to bad templates. As part of this add the needed SSH virtual power key (because like nova-bm, Ironic requires that for now). We also need to set the compute_manager for nova with Ironic, so that gets set too. Change-Id: I0d7d535dbac3584b3eb12865259ee6403e20c98f
2014-03-21Pass undercloud metadata to overcloud computeAllison Randal2-0/+49
Capture some undercloud metadata into the overcloud compute configs, so the overcloud nodes can pull updated images from the undercloud glance. Unset by default, but able to be set during stack-create or stack-update. Change-Id: I2997d23c584055c40034827e9beb58e6542ea11c
2014-03-21Adding image update policy to undercloud templateCian O'Driscoll1-0/+7
Allows image policy to be specified when updating the undercloud stack. This enables the preservation of persistent ephemeral disks. Change-Id: Id7bc0a72ae1737d2fdadb3f47006bd0cfb0bc42f Closes-Bug: #1295616
2014-03-17Merge "Change nova compute driver location"Jenkins1-1/+1
2014-03-14Change nova compute driver locationChris Krelle1-1/+1
This patch changes the location of the Ironic Nova compute driver in nova.conf so that it uses the driver from within the Ironic directory tree. This patch will need to be reverted once the Ironic Nova driver lands in the nova. Change-Id: I9199d506f3665cb0827edd642a1806713a42b90e
2014-03-14Remove unnecessary cinder metadataRyan Brady2-2/+0
Previously all cinder functionality was in a single element and required "volume: 'true'" to install the cinder-volume service. Now cinder has been split into multiple elements and you build an image with the cinder-volume element to achieve the same goal. This patch removes the "volume: 'true'". Change-Id: I2ed2e6f7c7db7619aee7ce4ba730f310344e0b0e
2014-03-13Add Wait Condition to Block Storage TemplatesRyan Brady2-0/+22
In some environments the heat stack-create command would complete even though the block storage node would still be in a build/spawning state. This patch adds a wait condition to ensure the block storage node has a chance to complete and the stack-create command to complete properly. Change-Id: Idb524625b8d6df1ff6f927c22b72bc6d3d611686 Partial-Bug: #1290764
2014-03-13Merge "Add heat.stack_domain_admin_password"Jenkins3-0/+18
2014-03-12Merge "Merge Block Storage into Overcloud"Jenkins1-11/+4
2014-03-12Merge "Remove Duplicate Rabbit Parameters"Jenkins1-7/+0
2014-03-12Add heat.stack_domain_admin_passwordClint Byrum3-0/+18
This new parameter will be used to configure Heat for the new required stack domain admin. Change-Id: Ieace33154a14f472aab8ac76b2b876db77230110 Partial-Bug: #1287453
2014-03-12Merge "Swift storage heat templates"Jenkins3-11/+149
2014-03-11Remove Duplicate Rabbit ParametersRyan Brady1-7/+0
This patch removes the duplicate rabbit username and password parameters. These parameters cause a conflict when running merge.py because they already exist in the overcloud template. Change-Id: I01d386577734c7c516a477e1e402882294ac4376
2014-03-11Merge Block Storage into OvercloudRyan Brady1-11/+4
This patch removes the seperate overcloud-with-block-storage.yaml make target and merges the functionality into the main overcloud.yaml target. The default BLOCKSTORAGESCALE is 0. Change this number to add additional block storage nodes. This patch also updates the overcloud-with-block-storage-nfs target to more closely resemble the overcloud.yaml target, including swift and ssl templates as needed. The default BLOCKSTORAGESCALE is 1. Change this number to add additional block storage nodes. Change-Id: Ifcc733cfbf9f356393c3f6c72b2bbbb0214d3040
2014-03-11Merge "Add rabbit.cookie attribute"Jenkins3-0/+32
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-26Add rabbit.cookie attributeJan Provaznik3-0/+32
All nodes in rabbitmq cluster should have same cookie. This patch adds default random cookie to existing templates. Change-Id: I6579089bd95b0169db20635479e077f3ecade8e2
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