19 Commits

Author SHA1 Message Date
Eamonn O'Toole
c48c1761df Add swift.mount-check metadata
We've submitted a patch (https://review.openstack.org/#/c/130172/)
to set the value of mount_check to swift.mount-check if it exists,
and otherwise to set mount_check to false.  By default TripleO
deployments set mount_check to false since they do not use mounted
disks to store data.  However we (HP) and others are now using
TripleO to deploy Swift servers with mounted drives for data, in
which case mount_check should be set to True.  This change adds
swift.mount-check data and sets it to the value of the
SwiftMountCheck parameter, which has a default value of False.

Change-Id: I36fece56bafa9fe9c4883b572687b3fc819eeae1
2014-11-12 17:09:04 +00:00
Jenkins
a35679f539 Merge "Add SwiftMinPartHours parameter" 2014-10-07 20:50:59 +00:00
Lorcan
24a45cb0de Add SwiftMinPartHours parameter
This parameter adds the facility for an operator to set the length
of time in hours that a partition in a swift ring can be altered
following a rebalance of that ring. The default value is set to one.

The corresponding element change is here:
Ie6438386a54794e1ae2f31ad925db01c2c10ed6d

Change-Id: Icc5e431a7e2884b3ca3a255b6fd901619bc98460
2014-09-29 10:22:28 +01:00
Jenkins
622d4cb6cf Merge "Parametrize Swift partition power" 2014-09-16 09:15:26 +00:00
Eamonn O'Toole
b7964165b7 Parametrize Swift partition power
The Swift partition power is currently hard-coded to 10.  While
this is fine for small Swift clusters there are some users who
will want to configure rings with higher partition powers.  We
have parametrized the value of the partition power, and the
default is set to 10.

Change-Id: If115cf5cf2f4c2ff7d28b0f5ae3d2ca3f4b4be5a
2014-09-05 11:19:22 +01:00
Jenkins
2d6e729c59 Merge "Remove unused Neutron values" 2014-09-01 14:31:33 +00:00
James Slagle
11e8ac8f75 Remove unused Neutron values
These Neutron parameters are not actually needed or used on a Swift
Storage instance. neutron-openvswitch-agent does not even need to be
present on a Swift node.

Change-Id: I5d61cc1d22a719b186e6d89baaf25f119e0416d7
2014-08-29 15:39:15 -04:00
Robert Collins
a7480472f7 Make Swift replica count configurable.
Using 1 is thoroughly non-HA :)

This is the HOT version of this patch.

Change-Id: Ic96bcdc03dacb9650520bd9ac1ce3805c6dac2fa
implements: blueprint tripleo-icehouse-ha-production-configuration
2014-08-13 12:12:58 +12:00
James Slagle
47568e1c16 Move config options under neutron.ovs
These config options are supposed to be under neutron.ovs (see template
for neutron openvswitch agent). They were mistakenly moved to be just
under neutron when the migration to SoftwareConfig was done.

Change-Id: I5769dc1dc501d48c965f8e4e36238cfcaac64a17
2014-08-05 17:24:23 -04:00
Steve Baker
beca15dec5 Port all templates to HOT
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-08-04 08:57:52 +12:00
Jenkins
db4d0a43a3 Merge "Adding Swift proxy-server memcache metadata" 2014-05-21 13:06:42 +00:00
Steve Baker
e9c3d6f06b Specify group os-apply-config for config resources
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-05-02 16:02:35 +12:00
Eamonn O'Toole
9d49401bdc Adding Swift proxy-server memcache metadata
Swift proxy-servers use memcache to store and share metadata. This
change adds swift.proxy-memcache metadata to the swift-source and
swift-storage-source yaml templates modelled on the existing
swift.devices metadata.  This metadata will be consumed by the
swift-proxy/os-config-applier/etc/swift/proxy-server.conf element
if the metadata exists.

Change-Id: If0b5724f69e7ec1c98e4dbdbeb9f08c4a18151b6
2014-04-17 13:47:57 +01:00
Clint Byrum
be5af1a35e Switch overcloud to software-config
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-16 14:10:48 +12:00
Dan Prince
0223d35c0c Stop using notCompute in favor of controller
Updates all references for notCompute and notcompute
to use 'controller' instead.

Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010
Partial-bug: #1300324
2014-04-09 13:26:41 -04:00
Richard Su
30301f322f Swift storage heat templates
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-10 22:00:42 +00:00
Robert Collins
4aff0fb3f7 Prep work for a scalable control plane.
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-31 11:23:03 +13:00
Dan Prince
b9198ad03a Fix case of OpenStack in templates.
merge.py seems to look for OpenStack::ImageBuilder::Elements

But we use Openstack::ImageBuilder::Elements in our templates.

Change-Id: I94ee367cf77c3f2929ee23d2dcdd28622849c89e
2013-11-26 11:20:22 -05:00
Derek Higgins
378783f876 Add metadata to configure swift
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-18 13:34:44 +00:00