372 Commits

Author SHA1 Message Date
Jenkins
162e8f4ceb Merge "Add ability to disable endpoint configuration" 2014-03-04 11:01:39 +00:00
Francesco Vollero
d0caf58916 Support for allow_versions in swift containers
The previous patch (37493) was just implementing the feature partially

Change-Id: I0adc55a22161fa3768d941e5ae996cc47048efa5
2014-02-25 17:39:12 +01:00
Mark T. Voelker
edd25ce6b3 Fix deprecation warnings in inline templates
The puppet-swift modules emit deprecation warnings of the form:

Warning: Variable access via 'pipeline' is deprecated. Use
  '@pipeline' instead. template[inline]:2
   (at (erb):2:in `result')

These are due to missing @ signs in inline ERB templates in
storage/server.pp and proxy.pp.  This patch fixes them.

Change-Id: I3745cfd86c4332f00bc10a0999088691b3833147
Closes-Bug: #1282717
2014-02-20 13:29:22 -05:00
Jenkins
d8430ea6ad Merge "Add support for middlewares with hyphens" 2014-02-17 16:21:15 +00:00
Mathieu Gagné
eb5eb1f961 Add ability to disable endpoint configuration
It is possible to disable endpoint configuration by setting
the value of the configure_endpoint and configure_s3_endpoint
parameters to false.

The default value is true, preserving default behavior.

Change-Id: I0f9afb78c181573a30f93dc4f862f86baa3efe31
Closes-bug: #1279071
2014-02-12 10:45:16 -05:00
Jenkins
d649bac32d Merge "Cleanup, Improve coverage of swift::keystone::auth spec tests" 2014-02-12 08:24:22 +00:00
David Moreau Simard
af45e4200e Add support for middlewares with hyphens
Change-Id: I1142270f76285190b600da759753011331a85909
Closes-bug: #1278950
2014-02-11 11:17:02 -05:00
David Moreau Simard
eefaf9ca54 Fix include_class deprecation warning. Use contain_class instead.
Change-Id: I9ab9e1d72a06b2de0d63601795b0902e53f330b6
2014-02-05 22:28:54 -05:00
Jenkins
3936163d41 Merge "dispersion: add endpoint_type parameter" 2014-02-05 13:09:54 +00:00
David Moreau Simard
c26875a010 Cleanup, Improve coverage of swift::keystone::auth spec tests
Refactor with shared examples, improves coverage with 12 additional
tests.

Change-Id: Ie686af051f11941a88ea479b1d9187560f8140bb
2014-02-03 18:07:33 -05:00
David Moreau Simard
f8fbd8addf Remove deprecated parameter 'address'
The address parameter has been deprecated since 2.0.0.

Change-Id: I57b8469fb816c37c9d6a285c07796f685b121a90
2014-01-31 15:59:32 -05:00
Emilien Macchi
6aa573e49a dispersion: add endpoint_type parameter
This parameter is needed to perform a clean object dispersion.

Change-Id: I1c17f49b22fd2b30c022d27a2bc20ce0bd150240
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2014-01-27 22:28:08 +01:00
David Moreau Simard
a5b5e1211f Allow configuration of admin and internal protocols for keystone endpoint
The public address is already configurable (http or https). This change
introduces the possibility of also configuring admin and internal endpoint
protocols as well. They are defaulted to http and therefore the change is
non-breaking and backwards compatible.
There was also no existing spec tests for overriding the public protocol,
this is fixed in this commit.

Change-Id: I1baafa444636729c4b73d2cca0753f6348fbd2a0
2014-01-17 15:38:00 -05:00
David Moreau Simard
449fd78f48 Remove redundant user ownership declaration and ensure spec test coherency
swift is already set as a owner for File[] resources. This is a
simple cleanup that removes a redundant user declaration. The spec
tests did not verify that default File[] values were applied to
/var/lib/swift.

Change-Id: I608ef39ca8bbf78ca8029a65979db659184baa3f
2014-01-09 11:48:04 -05:00
Jenkins
12131aa3a8 Merge "Update gitignore file" 2013-12-29 07:07:29 +00:00
Tianshi Li
7e06de1066 Fix the comment in manifests/storage/disk.pp
Change-Id: Ibd28c9a1dad091272be56eea7023f9dbb8abdba5
2013-12-27 20:45:34 +08:00
Sebastien Badia
c640a3e1c6 Update gitignore file
Change-Id: Ifc934ef2e5b30f600004a7a1f48dc30c6b4d2c57
2013-12-23 19:13:55 +01:00
Jenkins
5b450c8e25 Merge "Create swift operator keystone roles" 2013-12-20 22:43:49 +00:00
cbaesema
af129f0a93 Allow running of proxy and storage on the same node.
This adds conditionals to support a installation
in which a user desires to run both swift proxy and
storage on the same node.

Change-Id: I0cc827525968a9d1dc836c553a39f0ac13c4667e
2013-12-18 09:00:39 -06:00
Matthew Mosesohn
14a2bd8c4f Create swift operator keystone roles
Defining operator_roles in swift-proxy.conf requires
that these roles exist in keystone.

Because Keystone API access is not available on Swift
proxy hosts in most cases, operator_roles keystone
roles have been added to swift::keystone::auth class.

Added basic docs for swift::keystone::auth

Change-Id: Ib8454f8ae1316d2589ff228ec1424c6cff69c6b5
Closes-Bug: #1261662
2013-12-17 16:32:01 +04:00
Emilien Macchi
2fc0354936 Set include_service_catalog to False
include_service_catalog is a parameter in swift authtoken configuration.
Set to False improves performances.

Closes-Bug #1257738
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>

Change-Id: Ie5dd2de45fce79e4da7ccb5b37d7c69ee1cb5198
2013-12-09 11:45:20 +01:00
David Moreau Simard
72fa7bf89e Fixing remaining typo in the README
Change-Id: Ieb587f86f0bf92e0012477e2ec97aec27f320cd1
2013-12-03 16:31:22 -05:00
David Moreau Simard
9cc08a5eee Fix a few typos in the README
Change-Id: If9d2148ab5bf41e997896072d74c3eb5cc178c41
2013-12-03 16:12:30 -05:00
Sebastien Badia
c1aee547bc Bugfix: Fix fragment name for Quota middleware
Bugfix for commit 4157cb9 (uniformisation of pipeline names)
  According other swift proxy middlewares, the concat fragments
    doesn't contains « proxy » (concat frag. are generated by pipeline)
    see l195 and l196 of tests/site.pp

Change-Id: I99f9e5f5282b3e8db89fd56109ec8074ea1fa8f5
2013-11-27 16:21:09 +01:00
Chmouel Boudjnah
000d63b654 Fix auth_token configuration.
- cache=swift.cache need to be in auth_token configuration not in
  keystoneauth.
- Make auth_token using the same facility for logging than main swift.

Closes-Bug: #1254487

Change-Id: If5a09da4d18f247dc42b99e6f666bc2867d06dcb
2013-11-24 18:52:48 +01:00
Sofer Athlan-Guyot
3566f9fa65 Fix filter name for puppetdb
When creating the filter class name the last part is not capitalized.
So Swift::Storage::Filter::Healthcheck[bla] is named
Swift::Storage::Filter::healthcheck[bla].  Puppet don't detect the
syntax error as the resource is "created" within a string.  But
puppetdb's parser do not let this work.

This fix it and adjust the tests.

Change-Id: If11c3ad0e98d14b9387b3daa4afeb118387100f8
Closes-Bug: #1252998
2013-11-20 03:37:58 -05:00
Jenkins
328a805f1a Merge "Add Bulk middleware support" 2013-11-19 22:52:26 +00:00
Emilien Macchi
c7a6239b9b Add Bulk middleware support
Bring Bulk middleware configurable in module.

Change-Id: Iddec3f50402e6e2536fb7586f4966c06a1b75831
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2013-11-18 21:07:31 +01:00
Jenkins
b20ac7e3b0 Merge "Add Quota middlewares support" 2013-11-18 08:19:44 +00:00
Jenkins
040770582f Merge "Fix puppet 3.x template variable deprecation warning" 2013-11-06 07:26:34 +00:00
Xingchao Yu
8dd197a730 Fix puppet 3.x template variable deprecation warning
Change-Id: I0982c90b79ba4ff0844d5da778ae97b2f5221c37
loses-bug: #1244510
2013-11-01 10:57:53 +08:00
Emilien Macchi
4157cb9a41 Add Quota middlewares support
Two middlewares exist for managing quotas:
- account_quotas
- container_quotas

Change-Id: Ic6d539db480d8749769279b44e1f38302ac0fa62
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2013-10-30 16:17:35 +01:00
Jenkins
5e276b9ce3 Merge "Revert "Fix compatibility with latest puppetlabs-concat"" 2013-10-30 15:09:32 +00:00
Mathieu Gagné
e2e39f0ede Revert "Fix compatibility with latest puppetlabs-concat"
This fix broke everything. Lets revert it.

This reverts commit 23cc3616cea78b8431181af748a1827add18974f.

Change-Id: I9ce82c2e8f65606fbcedb4e2a4b37bc81edc5656
2013-10-29 23:13:47 -04:00
Mathieu Gagné
3a16f56b0d Pin puppetlabs-concat fixture to 1.0.0
Change-Id: I70bf489ca1f9873a749fb8774c775fe46610b7de
2013-10-29 22:54:44 -04:00
Jenkins
c9090bf724 Merge "Fix compatibility with latest puppetlabs-concat" 2013-10-29 17:08:53 +00:00
Mathieu Gagné
23cc3616ce Fix compatibility with latest puppetlabs-concat
concat::setup has been made a private class and can no longer be
included from modules outside concat itself.

concat::setup is already included by the concat define. Removing
its inclusion from puppet-swift classes shouldn't result in breakage
or loss of functionality.

Change-Id: I7566e09bd4e93aec719a495279cf92d8a898057e
Closes-bug: #1245936
2013-10-29 11:48:48 -04:00
Chris Hoge
9e110e8c8e Preparing for 2.2.0 release.
Updated version and dependencies in Modulefile.
Updated release notes in README.md.

Change-Id: I4e1279848fcd198cbddf00f9ff9e3a1e6125ad33
2013-10-07 15:20:59 -07:00
Jenkins
5a655f8694 Merge "Use swift_dispersion_config" 2013-09-20 07:47:24 +00:00
Mathieu Gagné
ba6abfa6c7 Use swift_dispersion_config
Use swift_dispersion_config to configure dispersion.conf

Implements: blueprint puppet-swift-ini-settings
Change-Id: I521eefa88e943858f850727f0e57ca35c6b695f2
2013-09-04 20:04:44 -04:00
Jenkins
ef8507d287 Merge "Use swift_bench_config" 2013-09-04 23:55:35 +00:00
Mathieu Gagné
49d6801247 Use swift_bench_config
Use swift_bench_config to configure swift-bench.conf

Implements: blueprint puppet-swift-ini-settings
Change-Id: I97a14f0210aa472876188e66249ea53f34afff72
2013-08-31 01:12:35 -04:00
Mathieu Gagné
0f7601a358 Deprecate classes with hyphens
Puppet does not recommend the use of hyphens in class names.

This change deprecates classes with hyphens and inform the users
to use the new ones. Backward compatibility is preserved.

Change-Id: I4991c956e297d76423a805558d9b6731473a4a51
2013-08-28 20:19:14 -04:00
Jenkins
943c2f0c6e Merge "Fix puppet-lint warnings about ensure" 2013-08-28 18:10:27 +00:00
Dan Prince
c89e327fb8 Use swift_config to configure swift.conf
This change also adds an autorequire in the swift_config
type to ensure the /etc/swift/swift.conf exists.

Change-Id: Ic591a3ceb040c4599339ed7f750a5273d2052ac1
Implements: blueprint puppet-swift-ini-settings
2013-08-26 20:54:06 -04:00
Dan Prince
f10bcda7e6 Revert "Use swift_config"
This reverts commit e7bb58e6ba39d7daeee9069c83451f8898d8a424.

Fixes LP Bug #1216881.

Change-Id: I65109b8bfeeb2f59971dadbdb14ec47b1fc82a89
2013-08-26 08:12:07 -04:00
Jenkins
d9d0917112 Merge "Use swift_config" 2013-08-26 08:05:28 +00:00
Jenkins
706f23df65 Merge "Fix puppet-lint warnings about double quoted string" 2013-08-26 05:49:42 +00:00
Mathieu Gagné
e2ff7b2a7a Fix puppet-lint warning about top-scope variable
Fix "top-scope variable being used without an explicit namespace"

Change-Id: Id397dacd1072e31bfb21d9d0ed60cff1bc57f06e
2013-08-25 23:37:54 -04:00
Mathieu Gagné
b8a225c9a0 Fix puppet-lint warnings about double quoted string
Fix warning: "double quoted string containing no variables"

Change-Id: I649bdcf11273de631c0060178776d64e329e2445
2013-08-25 23:37:19 -04:00