aboutsummaryrefslogtreecommitdiffstats
path: root/block-storage.yaml
AgeCommit message (Collapse)AuthorFilesLines
2014-08-04Convert Fn::Select to extended get_attrSteve Baker1-3/+3
Overcloud bootstrap_nodeid is now specified by parameter BootStrapNodeResource with default value controller0. This avoids the need to use Fn::Select on the mergy.py built list of controllers to specify the first controller. Change-Id: Id9cfeab50b90ceeeae51ea0e35997b7495b28cc4 Partial-Blueprint: tripleo-juno-remove-mergepy
2014-08-04Port all templates to HOTSteve Baker1-48/+48
This change was generated and validated by running the following: make hot clean all validate-all This converts all templates to be valid HOT. Fn::Select is not converted in this change but this will actually work with heat_template_version 2013-05-23. Fn::Select is converted manually in the next change in this series. This change also sets the heat_template_version to 2014-10-16 which includes the list_join intrinsic functions used throughout these templates. Partial-Blueprint: tripleo-juno-remove-mergepy Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
2014-07-22Add signal_transport propertyJames Slagle1-0/+1
Specify NO_SIGNAL for signal_transport on the BlockStorage0Deployment resource. Otherwise, this resource remains CREATE_IN_PROGRESS forever. Change-Id: I973d197245ed32612bde9209479e6ae3a443fc69
2014-07-22Add user_data_formatJames Slagle1-0/+1
user_data_format must be set to SOFTWARE_CONFIG on instances of OS::Nova::Server where there are deployments. Corrects the following error: ERROR: Resource BlockStorage0's property user_data_format should be set to SOFTWARE_CONFIG since there are software deployments on it. Change-Id: Iba29588374980098d71585ff1bf26ad914a6711c
2014-07-17Remove extra listJames Slagle1-1/+1
We are using "ctlplane" as the first parameter to Fn::Select here, so the second parameter must be a map, not a list. Fixes the following error: ERROR: Property error : BlockStorage0Deployment: input_values Index to "Fn::Select" must be an integer Change-Id: I34153543f8c3152df449e1b42e1f76a78a7d6ba3
2014-05-20Merge "Specify group os-apply-config for config resources"Jenkins1-0/+1
2014-05-02Specify group os-apply-config for config resourcesSteve Baker1-0/+1
This will indicate to os-collect-config that this config resource represents os-apply-config configuration data, so it can only write out top-level config files for os-apply-config data (or Heat::Ungrouped for backwards compatibility). Change-Id: I3552fdd6df8106ab83cfd17d5f4b137cf33fbc36 Related-Bug: #1299109
2014-04-25Make size of loop device used by cinder LVM configurableDuncan Thomas1-2/+4
This was hard-coded to 5 gig, which is useless for anything other than tempest runs and smoke testing block-storage-nfs.yaml has intentionally not been changed, since volume_size_mb is not used in that setup. Cleaning up that code will be done separately. Change-Id: I476b906a8d439d3e6643dd0c214965c5862418e8
2014-04-16Switch overcloud to software-configClint Byrum1-80/+60
This migrates the overcloud to using OS::Heat::StructuredConfig and OS::Heat::StructuredDeployment. With those tools, we can decouple servers from software configuration and begin to deprecate features in tripleo_heat_merge. Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
2014-04-09Stop using notCompute in favor of controllerDan Prince1-4/+4
Updates all references for notCompute and notcompute to use 'controller' instead. Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010 Partial-bug: #1300324
2014-04-08Merge "Allow setting the cinder iscsi-helper option"Jenkins1-0/+2
2014-03-31Allow setting the cinder iscsi-helper optionBen Nemec1-0/+2
This is necessary to support iscsi helpers other than tgtadm, such as lioadm. Change-Id: I8a63872185f73372fcf6c90d3dde31e5bb0a168b
2014-03-27Add BlockStorage0Config ResourceJames Slagle1-4/+41
Add a BlockStorage0Config resource in the block-storage.yaml template. This was missing previously and was causing the behavior of having all block storage nodes only being created after all other nodes were up in a deployment (I presume b/c of the wait conditions). Also, we need the BlockStorage0Config resource so that we can get the configuration of neutron-openvswitch-agent from the metadata, previously the values in the file were unset, causing the service to fail to start. Change-Id: I297de24079d1ece66d35213b4ef1f2c8c50e73f0
2014-03-26Merge "Remove unnecessary cinder metadata"Jenkins1-1/+0
2014-03-14Remove unnecessary cinder metadataRyan Brady1-1/+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 Brady1-0/+11
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-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-02-25Different Flavors for Tuskar rolesLadislav Smola1-1/+5
- 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-20Remove uses of functions in parameter defaultsClint Byrum1-12/+3
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 Su1-0/+4
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-03Merge "Remove InstanceType and ImageId from cinder template"Jenkins1-2/+0
2014-01-31Prep work for a scalable control plane.Robert Collins1-4/+4
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-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-15Add optional cinder storage node to overcloudRyan Brady1-0/+66
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