aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/swift
AgeCommit message (Collapse)AuthorFilesLines
2017-06-14Ensure hiera step value is an integerSteve Baker3-3/+3
The step is typically set with the hieradata setting an integer value: {"step": 1} However it would be useful for the value to be a string so that substitutions are possible, for example: {"step": "%{::step}"} This change ensures the step parameter defaults to an integer by calling Integer(hiera('step')) This change was made by manually removing the undef defaults from fluentd.pp, uchiwa.pp, and sensu.pp then bulk updating with: find ./ -type f -print0 |xargs -0 sed -i "s/= hiera('step')/= Integer(hiera('step'))/" Change-Id: I8a47ca53a7dea8391103abcb8960a97036a6f5b3
2017-06-14Merge "Fix Swift ring management in container deployments"Jenkins1-7/+25
2017-06-09Fix Swift ring rebalance orderChristian Schwede1-2/+2
The current order is broken if there were changes to the account and container devices, but not to the object devices. In these cases it can happen that the rebalance happens before modifying devices. Change-Id: I15641c32266939c9a00936cc471cc59b1bb54eec
2017-06-07Fix Swift ring management in container deploymentsChristian Schwede1-7/+25
The ring up- and downloading was never executed if run within a containerized environment. This is due to the fact that this manifest gets executed within step 6(5) only. There is also an ordering issue, which actually tries to create the tarballs before rebalancing. This patch fixes the step conditions and also chains the tarball creation to the rebalance. The check to query rings on all nodes can now be disabled. This is required on containerized environments: the local ring will be modified and rebalanced, but rings on the existing servers are not yet modified. Therefore a recon-check will fail, and needs to be disabled. Closes-Bug: 1694211 Change-Id: I51c5795b9893d797bd73e059910f17a98f04cdbe
2017-04-27Fix wrong notify in swift proxy profileJuan Antonio Osorio Robles1-1/+1
the TLS proxy was notifying neutron::server instead of swift proxy. Change-Id: I212978c107a75209d5b7c266e608eb9a9e9cdc76
2017-04-07Merge "Migrate Swift ring handling from tripleo-heat-templates to ↵Jenkins1-0/+36
puppet-tripleo"
2017-04-05Migrate Swift ring handling from tripleo-heat-templates to puppet-tripleoChristian Schwede1-0/+36
This allows decoupling the Swift ringbuilding logic from the Controller and ObjectStorage roles. A follow up patch will modify tripleo-heat-templates and use this modified class. Actually this downloads the Swift rings even if ring building is disabled or if there is no need to rebalance. This is required, because operators can disable ring building, but use the same mechanism to distribute pre-built rings to the nodes. If ring building is disabled, these won't be uploaded at the end back to the undercloud. Related-Bug: 1665641 Change-Id: Ifd6fa5b398d98e8998630ea0c9a2ce9867ceba2b
2017-04-04Clean up TLS-related bits from swift-proxyJuan Antonio Osorio Robles1-13/+4
bp tls-via-certmonger Change-Id: I8a66d3a067f934ea30b668308237cbca1d58fbb8 Depends-On: I3cb9d53d75f982068f1025729c1793efaee87380
2017-04-04Add TLS in the internal network for Swift ProxyJuan Antonio Osorio Robles1-1/+68
This adds the necessary bits for a TLS Proxy to be placed in front of swift proxy when TLS-everywhere is enabled. This will be furtherly cleaned up once the t-h-t bits are added. bp tls-via-certmonger Change-Id: I6e7193cc5b4bb7e56cc89e0a293c91b0d391c68e
2017-02-17Use rpc and notify transport_url for oslo_messaging backendsAndrew Smith1-2/+2
This commit adds the transport_url for specifying the oslo.messaging rpc and notify transport schemes. The rpc or notification backend can be one of rabbit, amqp, zmq, etc. Oslo.messaging is deprecating the host, port and auth configuration options. All drivers will get the options via the transport_url. This patch: * Adds transport_url to base services * Updates the corresponding specs * Adds to default hierdata Depends-On: I1cf93d2caebfa1f7373c16754a2ad9bd15eb1a40 Change-Id: Iea5607dbb3ee6b1dd50acc1395de52dc920aa915
2017-02-03Merge "add cache to object-expirer pipeline"Jenkins1-0/+1
2017-02-01Use transport_url for swift-proxy instead of rabbitmq paramsJuan Antonio Osorio Robles1-25/+52
These parameters are being deprecated, so we should be using the transport_url format instead. Change-Id: I8b7457b6233c4f88af2d7bc1b9304fcccb6edf61
2017-01-17add cache to object-expirer pipelineMarcus Furlong1-0/+1
Without 'cache' in the object-expirer pipeline, adding $memcache_servers will have no effect. This commit adds 'cache' to the pipeline. Change-Id: I8ddb71e8e6a5844446dd2478b6b9389ed0ade075
2017-01-17Merge "Add missing Swift base class"Jenkins1-0/+1
2017-01-16Merge "Include swift::storage::loopbacks class"Jenkins1-0/+1
2017-01-16Merge "Set memcache_servers in /etc/swift/object-expirer.conf"Jenkins1-1/+3
2017-01-16Merge "Enable object-expirer on Swift proxy profile"Jenkins1-0/+2
2016-12-20Add missing Swift base classChristian Schwede1-0/+1
The Swift base class is required if the SwiftStorageRole is used without the SwiftRingBuilder role. Change-Id: I496b65dc53c03c0711d21f98627cc21be653ca5d
2016-12-11Decouple swift-proxy from ceilometer packagesDan Prince1-8/+15
This patch updates the swift proxy so that it only depends on ceilometer if the ceilometer_api_enabled all-nodes-data hiera setting has been set. Also removes a parameter dependency where the tripleo::profile::base::swift::proxy class was referencing a puppet-ceilometer value from hiera (which can also cause ceilometer dependencies). Depends-On: Ief5399d7ea4d26e96ce54903a69d660fa4fe3ce9 Change-Id: I8d9f69f5e9160543b372bd9886800f16f625fdc6 Closes-bug: #1648736
2016-11-30Include swift::storage::loopbacks classChristian Schwede1-0/+1
This makes it possible to create loopback devices for Swift by using additional Hieradata. For example, to create a 100M loopback device that will be mounted on /srv/node/d1: parameter_defaults: ControllerExtraConfig: swift::storage::loopbacks::args: {"d1": {'seek': '100000'}} Depends-On: I11a230b7cf08a4cc2a144d9af0e6c81bb3827348 Change-Id: I8741acc8afa1f1d23c5b25fa4bf27622f674a561
2016-11-30Set memcache_servers in /etc/swift/object-expirer.confChristian Schwede1-1/+3
This defaults to 127.0.0.1:11211 without setting these explicitly. The object-expirer is working without a correct memcache server, however it is slower and warnings will be logged. Related-Bug: 1627927 Depends-On: Ie139f018c4a742b014dd4d682970e154d66a8c6d Change-Id: I89a879592a264d541cf42f007584e2e78058c867
2016-11-29Enable object-expirer on Swift proxy profileChristian Schwede1-0/+2
This service is required to delete expired automatically. It is often run on the proxy nodes, therefore adding it to the Swift proxy profile. Change-Id: I3250c205ffc166ae628bc427de2e3492d086c3bb Closes-Bug: 1645657
2016-11-28Use FQDNs for the services' RabbitMQ configurationJuan Antonio Osorio Robles1-4/+4
This replaces the services' IP-based RabbitMQ configuration and uses FQDNs instead. Change-Id: I2be81aecacf50839a029533247981f5edf59cb7f
2016-11-09adding new swift middleware that is typically enabled by defaultThiago da Silva1-0/+5
These are features that are typically enabled by default in any swift cluster. Change-Id: Ie323f68255a73d46e774cbf49d9353c3bf90c35e Signed-off-by: Thiago da Silva <thiago@redhat.com>
2016-11-04swift/proxy: configure rabbitmq properlyEmilien Macchi1-3/+16
Use rabbitmq_node_ips to find out where rabbitmq nodes are, and have correct ipv6 syntax if required. Closes-Bug: 1637443 Change-Id: Ibc0ed642931dd3ada7ee594bb8c70a1c3462206d
2016-10-19Merge "Include ::swift::config in Swift API and Storage roles"Jenkins2-0/+2
2016-10-14Merge "Add part_power and min_part_hours for Swift"Jenkins1-0/+13
2016-10-13Add part_power and min_part_hours for SwiftChristian Schwede1-0/+13
Change-Id: I78049105adf52226d47cc6764b1ba6c2c06e91e5 Related-Bug: 1631926
2016-10-11Add versioned_writes to Swift proxy configChristian Schwede1-0/+1
Tempest expects object versioning to be enabled by default in Swift; if not it has to be disabled explicitly in the Tempest config. This is a commonly used middleware, therefore it should be enabled in the overcloud proxy nodes as well. Closes-Bug: 1632215 Change-Id: I07a206473ff7939749e3eba1dfe3ea8c4526eb5c
2016-10-07Include ::swift::config in Swift API and Storage rolesGiulio Fidente2-0/+2
This changes makes the Swift API and Storage roles to include the ::swift::config class, as we do for the other OpenStack services, which is useful to push arbitrary config settings into Swift. Change-Id: Iaf2c2f0f0103fe9264ce875099a1578b353a5558
2016-10-03Merge "Add swift proxy for ceilometer middleware"Jenkins1-0/+1
2016-09-26Merge "Fix Swift manifest for Puppet4 deployment"Jenkins2-2/+2
2016-09-23Add swift proxy for ceilometer middlewarePradeep Kilambi1-0/+1
swift proxy has already been updated to use updated ceilometermiddleware as indicated here [1]. Include it in the proxy class. [1] https://github.com/openstack/puppet-swift/commit/e8ad981eff0f97c24a53197c42caf350627d3c9f Change-Id: Ie49f4a750368ff174b23b8d6baa743d0956d727e
2016-09-21Fix Swift manifest for Puppet4 deploymentEmilien Macchi2-2/+2
1) swift/ringbuilder: seed must be a String Because we use validate_re in puppet-swift and puppet4 requires the regex to be a string, not an integer. 2) Fix Swift package name In puppet4, we need the resource title, not the resource name. Change-Id: I50cea96d45e0eb46c19040d9a7105ab72c2dbef7
2016-09-20swift: normalize memcache servers IP addressesEmilien Macchi1-1/+1
In the case of memcache servers are IPv6, make sure brackets set in the way we construct the list of memcache server + memcache port parameter. Also add unit-tests to test that the output is what we want in the configuration. Depends-On: I8d361ce9cfcfe6a3f8592b2b7991971a3c748c75 Closes-Bug: 1625335 Change-Id: I9fb8168d8fb56c9d8465d58a45fd8c6edfee6fdd
2016-09-16Swift add_devices.pp IPv6 handlingGabriele Cerami1-1/+4
Add brackets to IPv6 addresses before forming $object from $base Change-Id: I4568d538561a0102b69f331a122d4989333a3bfa Closes-Bug: #1623096
2016-09-06Merge "Convert ringbuilder to build devices array"Jenkins1-4/+26
2016-09-02Convert ringbuilder to build devices arraySteven Hardy1-4/+26
Currently we have some hard-coded mangling in t-h-t but we instead need to build the array based on the nodes running swift storage, combined with the SwiftRawDisks parameter. This will enable running SwiftStorage on nodes other than Controller and SwiftStorage roles, and is required for custom-roles due to the hard-coded stuff in the role templates and overcloud.yaml Change-Id: I11deed1df712ecccf85d36a75b3bd2e9d226af36 Partially-Implements: blueprint custom-roles
2016-09-01Create memcache_servers list in swift proxy profileSteven Hardy1-1/+14
Instead of mangling this list in t-h-t, generate the list derived from memcached_node_ips, which is now always set when memcached is deployed, regardless of the role. Note the port default is hard-coded as this is already hard-coded (in two places) in t-h-t, but we can override it if this changes in future. We need this to remove the swift specific stuff out of overcloud.yaml to enable custom-roles. Change-Id: Ic8872e5e51732874ca5b93bff5efd3e7ed75bc31 Partially-Implements: blueprint custom-roles
2016-08-18Merge "Allow use of raw disks for Swift storage role"Jenkins1-0/+1
2016-08-08Fix parameters and headers inconsistency in the puppet manifests.Carlos Camacho4-25/+24
As we are staring to manually check overcloud services the first step is to check that the puppet profiles are all aligned. Changes applied: No logic added or removed in this submission. Removed unused parameters. Align header comments structure. All profiles parameters sorted following: "Mandatory params first sorted alphabetically then optional params sorted alphabetically." Note: Following submissions will check pacemaker, cinder, mistral and redis services in the base profiles as some of them has the $pacemaker_master parameter defaulted to true. Change-Id: I2f91c3f6baa33f74b5625789eec83233179a9655
2016-08-04Allow use of raw disks for Swift storage roleGiulio Fidente1-0/+1
Adds a call to swift::storage::disks to make it partition additional disks to use with Swift. Depends-On: I3692b17988f8eacb7b8a7df1006a7fe24f587065 Change-Id: Iac75cf2244339fae444be5859b7583e80bafc4e2
2016-07-14Add swift ringbuilder profileSteven Hardy2-0/+136
I think this will need refinement in future, but for now this is just a copy of what we have in t-h-t Change-Id: I427f0b5ee93a0870d43419009178e0690ac66bd6 Partially-Implements: blueprint refactor-puppet-manifests
2016-06-29Merge "Add puppet profile for swift storage"Jenkins1-0/+52
2016-06-22Add puppet profile for swift storageSteven Hardy1-0/+52
Breaks out the swift storage configuration from t-h-t to a composable profile Change-Id: Ie68d7eccf4938bdbdea93327af0638b3fd002b3e Partially-Implements: blueprint refactor-puppet-manifests
2016-06-08Enable bulk delete in swift for gnocchiPradeep Kilambi1-0/+1
Closes-bug: #1590495 Change-Id: I912c09584d9b4cae530a247c91b6fd331943a8c5
2016-05-31Add puppet profile for swift proxySteven Hardy1-0/+44
Breaks out the swift proxy configuration from t-h-t to a composable profile Change-Id: I6bd72284911f3f449157a6fc00b76682dd53bd8c Partially-Implements: blueprint refactor-puppet-manifests