349 Commits

Author SHA1 Message Date
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
Mathieu Gagné
0098067226 Fix puppet-lint warnings about ensure
Fix warning: "ensure found on line but it's not the first attribute"

Change-Id: Iecc0cd4fe267c40fbef9a84ff1da2eaff5aa45a7
2013-08-25 23:29:34 -04:00
Mathieu Gagné
e7bb58e6ba Use swift_config
Use swift_config to configure swift.conf

Implements: blueprint puppet-swift-ini-settings
Change-Id: I3cb4b4f6f5586216e503dfe9b66b5e2e457cc90f
2013-08-25 23:22:05 -04:00
Jenkins
97a921947b Merge "concat module was moved from ripienaar to puppetlabs" 2013-08-16 18:13:56 +00:00
Colleen Murphy
84d645883b concat module was moved from ripienaar to puppetlabs
Change-Id: I2fa378d99fd250fbfe77caa286db24ee968ec9be
2013-08-16 00:41:26 -07:00
Jenkins
bf34ca881b Merge "Improve Proxy Signing Directory Support" 2013-08-15 17:57:27 +00:00
William Van Hevelingen
64ff379fad Validate that swift zones are integers.
As per the docs, zones are numbers starting at 1.
http://docs.openstack.org/developer/swift/deployment_guide.html#preparing-the-ring

Change-Id: I9bcc1616ad266b09ae4be65bf35b31ea0a455af7
2013-08-13 16:19:04 -07:00
Mathieu Gagné
418e7c736b Disable 80chars/class_parameter_defaults checks
* Disable warnings for "line has more than 80 characters"
* Disable warnings for "parameterised class parameter without a default value"

We do not wish to track warnings for such violations.

Change-Id: Id4e7ab198575ebe8e0c6cb8803ab96495bac1d65
2013-08-12 17:50:21 -04:00
Daneyon Hansen
f71d159c4d Improve Proxy Signing Directory Support
1. The signing_dir was being created on every swift node
when it's only needed on proxies:

  http://docs.openstack.org/grizzly/openstack-compute/install/apt/content/installing-and-configuring-the-proxy-node.html

2. The signing_dir was not configurable, even though
the OpenStack doc's show multiple references
(/var/cache/swift and /home/swift/keystone-signing).

Change-Id: I3eb00046fc535a32d7a1800d15489e9fe071373b
2013-08-12 18:39:15 +00:00
Donovan Finch
a1a0a89ad1 Remove puppetlabs-create_resources dependency.
Puppet 2.7 includes this functionality in core, and 2.6 is EOL.

Change-Id: I59cc9a6775d0d8a9a146903d64d2891b5b677630
2013-08-09 16:54:01 -07:00
Robert Werfelmann
a08b743807 Fixed some spelling errors
Change-Id: I05f76d9b86aadc1a8d1f0d32d96b4c1bacde62cd
2013-08-09 13:14:02 -07:00
Connor Kaz
77ba94db56 Update fixtures.yml to use puppetlabs/xinetd
Change-Id: Ic168bb312f68b17f6c699d915f4d8d42f72613a9
2013-08-08 18:30:49 -07:00
Chris Hoge
f8b36489f4 Puppet Forge release 2.1.0
Updated README.md for Puppet Forge release 2.1.0
Updated Modulefile to version 2.1.0

Change-Id: Ia0c2d4c8079f825e163291e1d4ff23b0d16616e4
2013-08-07 18:19:12 -07:00
Bradley Rasmussen
63c3fc3463 Update modulefile and fixtures to use puppetlabs/inifile
cprice404/inifile was moved to the puppetlabs namespace on the forge
and github.

Change-Id: I853d6056273ccfeff7f03fc522afbaa6f4801b1f
2013-08-07 16:04:24 -07:00
Mathieu Gagné
178f4b18dc Various Puppet lint fixes
* Fix following warnings:
    * double quoted string containing no variables
    * indentation of => is not properly aligned
    * mode should be represented as a 4 digit octal value or symbolic mode
    * string containing only a variable
    * top-scope variable being used without an explicit namespace
    * unquoted file mode
    * variable not enclosed in {}
* Fix following errors:
    * trailing whitespace found
    * two-space soft tabs not used
* Remove quotes around class in include/require statements

Change-Id: Ia920d848e1955612a6486ec8731309e6d3a70f63
2013-08-02 11:51:57 -04:00
Dan Bode
cb2e06556d Add signing dir
Currently, my swift installation fails with the following
error message:

  [Errno 13] Permission denied: '/root/keystone-signing

and the proxy server can never service requests.

This is b/c by default the client side directory for
pki-signing seems to use $HOME. This commits sets the
directory to be /var/cache/swift/ and resolves my
swift-proxy issues.

Change-Id: Ice904a9d53432ba1a1ae9516cd0ee6204ade63bb
2013-07-29 07:21:48 -07:00
newptone
b4584daaae Add configurable log for proxy-server service
This patch add configurable log for swift proxy-server service.
And add related spec test.

Partially implements blueprint puppet-swift-log-support.

Change-Id: I385093b3e63f8210d83ec125e6d2578b06b631d4
2013-07-26 04:33:23 +00:00
Mathieu Gagné
e41a552afe Add ini_setting based custom types for configs
Previous configuration file management method used templates.
This method had limited flexibility and was cumbersome
to use and maintain between upstream versions.

This change introduces new custom types based on ini_setting:
  * swift_account_config: /etc/swift/account-server.conf
  * swift_bench_config: /etc/swift/swift-bench.conf
  * swift_config: /etc/swift/swift.conf
  * swift_container_config: /etc/swift/container-server.conf
  * swift_dispersion_config: /etc/swift/dispersion.conf
  * swift_object_config: /etc/swift/object-server.conf
  * swift_proxy_config: /etc/swift/proxy-server.conf

The use of ini_setting offers multiple advantages:
  * Ability to individually manage configuration settings without
    the need to modify templates. This allows the user to manage or
    override settings that aren't handled by the module.
  * Use upstream default values if none is provided.
  * Remove the need to maintain and synchronize templates
    to match upstream versions. Such maintenance could become
    problematic and complicated if multiple upstream versions
    are supported but have different base configuration files.

Implements: blueprint puppet-swift-ini-settings
Change-Id: Iba7be64581b81b8ab4f33cf7096df37e64ccc4b4
2013-07-25 10:19:30 -04:00
Jenkins
503d3e41c0 Merge "Added the allow_versions flag to enable/disable object versioning in swift object container" 2013-07-22 15:59:07 +00:00
Francesco Vollero
4d96d896ca Added the allow_versions flag to enable/disable object versioning in swift object container
Change-Id: Id78be1a8c3dccd550c92204c4aaa1cf32edcbf61
2013-07-19 16:40:13 +02:00
newptone
6a0e505ee9 Add configurable log for storage server
This patch add configurable log for swift account/container/object
server service.
Partially implements blueprint puppet-swift-log-support.

Change-Id: Ib3db483dfbad97f23ab7ba2068632856b5e00f11
2013-07-18 02:33:07 +00:00
Mathieu Gagné
c8936fea9b Use @ notation for ERB template variables
Fix Puppet 3.2 deprecation warnings (see Puppet #19058)

Change-Id: I0da9696499bce281ad258cbf0e88bd57f7dde76f
2013-07-17 14:33:00 -04:00
Newptone
45cec2d3fb Add swift::bench to manage swift-bench.conf
This patch adds a conf file swift-bench.conf
for swift performance bench, and add a spec
test for it.

Fixed bug 1188968

Change-Id: Iafb67f116a9403bba96328be7c9c09d21a65a74c
2013-07-05 11:50:27 +08:00
William Van Hevelingen
75e29ee2be Fix Puppet 3.2.x deprecation warnings
Change-Id: I4f6075fb189474ee071fa9b80944a5fe5c062193
2013-07-12 15:40:02 -07:00