Skip to content

Commit

Permalink
Update puppet modules to their respective masters
Browse files Browse the repository at this point in the history 
Update apache to 8df51aa

8df51aa Merge pull request #1104 from mhaskel/pin_concat
98766fd Use concat 1.2.x
28a5391 Merge pull request #1101 from cmurphy/fix_access_log_tests
3c20633 Use string instead, not regex, for file test
2858f98 Merge pull request #1100 from mat1010/MODULES-1932-proxy_pass_match-fix
26b7759 - Changed rspec test for proxy_pass_match to be more precise
355f6fa Merge pull request #1099 from mlandewers/expires_typo
7fdafee - Changed vhost.pp to make use of the proxy template when proxy_pass_match is defined - Added rspec tests for proxy_pass_match
b4c7ce6 Fix typo in expires documentation
9202d40 Merge pull request #1097 from mrgum/master
09da0d1 Merge pull request #1057 from fraenki/param_lib_path
b1d640f make $lib_path configurable
c901662 validate_apache_log_level function to apply same test to both apache class and vhost - trace levels also supported
0e8fb04 Merge pull request #1095 from pmoranga/patch-1
69e0a89 Merge pull request #1070 from stevenpost/fixes/apache_name
8f8f6ac fix syntax of code examples
296aab5 The base class must be defined first so the parameters are known
4290182 no longer enforce default value for $apache_name

Change-Id: I6860e5eb16379a7e2ab43cfd2a4e99e9d8c7f2d2

Update ceilometer to 0ec70ff

0ec70ff spec: Add Unit Tests for Ceilometer_config type/provider
2b3a328 Pin puppetlabs-concat to 1.2.1 in fixtures
1c3a3ae Merge "Add udp_address/udp_port parameters for collector."
2405adf Add udp_address/udp_port parameters for collector.
9044614 Fix some missing rspec3 keywords

Change-Id: Ie606556364d996d36a5f0eee0d2278da41edb3fe

Update cinder to cc7279832bb7bd2840c831219f5f00a0f2efb8a3

cc7279832bb7bd2840c831219f5f00a0f2efb8a3 Merge "Update NetApp params for Kilo"
b7f122d3ed6daf8bbc125455a147017b4756e90c Update NetApp params for Kilo
f083cb4f34dd35fb81d0495a8f56e783863664b4 Pin puppetlabs-concat to 1.2.1 in fixtures
ba4322a42d9ca39348d29c00ea0ded59ef3af201 Merge "Adds OracleLinux support"
41567f5b6db75808b5028c241ad15be4aee2ab84 Create a sync_db boolean for Cinder.
e8b62b3ff381cfd40611d3bcb2e806951757a66e Adds OracleLinux support

Change-Id: I39b075db9c7f2f32e6aa43b4eaa8e36031d29197

Update concat to 30cb251

30cb251 Merge pull request redhat-openstack#298 from bmjen/fix-windows-acceptance
3809409 fixes acceptance tests on windows
583c528 Merge pull request redhat-openstack#296 from bmjen/fix-windows
6cfa62b fixes windows.
e2b189e Merge pull request redhat-openstack#297 from bmjen/o_____p
cd03959 re-add removed params for backwards compatibility
ea5af52 Merge pull request redhat-openstack#295 from hunner/fix_metadata
2ccde9d Merge pull request redhat-openstack#294 from bmjen/geppetto-fix
c96ae6a The jenkins geppetto plugin is still complaining
4e61c33 more geppetto lint fixes
f23bd17 Merge pull request redhat-openstack#293 from bmjen/geppetto-fix
71c815b fix linting errors
5059019 Merge pull request redhat-openstack#291 from psoloway/readme
9970cc6 Merge pull request redhat-openstack#290 from bmjen/refactor-native
51bd49f refactor concat to wrap electrical/file_concat
d45e281 Updates README per 936dc29
15ecb98 Merge pull request redhat-openstack#288 from woneill/ticket/MODULES-1700-backup_files_for_static_compiler
aa133e2 Override File default with backup value instead of assuming 'false'
e34eac0 (MODULES-1700) Change the filebucketing behavior so static_compiler can handle them
a0942af Merge pull request redhat-openstack#284 from buzzdeee/master
6f88096 Merge pull request redhat-openstack#287 from j-vizcaino/feature/setup-user-group-explicitly
936dc29 Merge pull request redhat-openstack#289 from puppetlabs/1.2.x
c2d056b spec/setup: Fix indent
e811550 setup: update tests to check for proper user/group ownership
0193fd2 setup: set user/group explicitly for dirs & script
b20d8b9 Fix breakage on OpenBSD in similar fashion as it is done for Windows. Broken since the switch from the shell script to the ruby script.
710b3d5 Merge pull request redhat-openstack#268 from mhaskel/1.2.0-prep
7f97a0e 1.2.0 prep

Change-Id: I96720e3801ce5a4f65b41cccc86f32d23b007890

Update glance to c0feafd0e9705870349b6b75ef1727ddd6b81035

c0feafd0e9705870349b6b75ef1727ddd6b81035 Merge "Revert "Separate api and registry packages for Red Hat""
876e857b29970081737e47d4a9ffe63d9776b73e Revert "Separate api and registry packages for Red Hat"
354ae692a502a6089f4f82b3b58ee2aaa42443a2 Fix os_region_name in provider
3f07c87f888e8770ca85e976688c25c0c6a90e9d Merge "Change location to be a param, not a property"
1d0a8ba83dfa0b4970b1b40259f45e3dd77ea543 Change location to be a param, not a property

Change-Id: I0deabc3914a0fa5353c6b9b8afc449aa3c744e55

Update gluster to 4b96b871dc414727160b51a7a454c518382ea9aa

4b96b871dc414727160b51a7a454c518382ea9aa Add value for value for performance.readdir-ahead volume property.
2ecc70a439ae96b992ea0a0ff972da1b26c1a661 Update data.pp
ce2b0b7638b046372e8f02a37c10d2e70f0292fb typo
bfc0a1956b65ec2f0816502d2c450a1fee9879e9 Small nitpick to fix indenting.
0e3504ea279bf6f3ccf5a5c3d1877467eece1807 added mount owner and group parameters

Change-Id: I74bd1d109b0e5833f8c83b42adf4e2c46db2400f

Update gnocchi to 135849d3f11592f6e6b1d4d86ac161a265ad3d28

135849d3f11592f6e6b1d4d86ac161a265ad3d28 Use the new ':expect' syntax in rspec 3.x

Change-Id: Ie4d675297875b5471459945503b40af403c1688d

Update haproxy to 33ceaf932fb694e54fc3d917580e2c89e40f0ae7

33ceaf932fb694e54fc3d917580e2c89e40f0ae7 Merge pull request redhat-openstack#179 from tphoney/gentoo_135
7edeb391b8eb7c4601758449c286c85b97432b0d adding unit tests, removing official support.
b9e58e4b36dcf294237aeda0ac1d10c8011fccb8 gentoo compatibility
ea48e0b3279cc4df9e92cf029078f26e1dbbe095 Merge pull request redhat-openstack#173 from antaflos/options-as-array-of-hashes
d9dd15aa0a86be5635b7d13c03bf4395b22371b9 Implement `options` as array of hashes so order is preserved

Change-Id: I2f9923f02d2a1b483ce86949eb2a57884c913c60

Update heat to 80e16dc9758ee6307f99ad3a14d5d26d70629fcd

80e16dc9758ee6307f99ad3a14d5d26d70629fcd Merge "Pin puppetlabs-concat to 1.2.1 in fixtures"
bda97e32c7aea93cc225fff9826dfec25f032321 Pin puppetlabs-concat to 1.2.1 in fixtures
c280fa550114744adb0b572982c0820ace9b207b Fix Keystone domain class
744f4bbcf5bfa8d09993c6e598b10c4190c10467 Create a sync_db boolean for Heat.

Change-Id: I6cd6c4c23a35271f2de65ca2edd4b4da216171e0

Update horizon to 32ed597ccc069086bcb0a0e1e722638072d18fcf

32ed597ccc069086bcb0a0e1e722638072d18fcf Pin puppetlabs-concat to 1.2.1 in fixtures
cb436e722e68564acc8dd98fa1c9b32ea34a00b7 spec: updates for rspec-puppet 2.x and rspec 3.x
f6bece8c53c0bc5fb690728f91aec38e92d770da Add support for Neutron DVR and L3 HA options

Change-Id: Ib1cb44da2ea54865d6d0418f2fa8f67484d19b5c

Update keystone to feacfd425186acf86237306c99d4c5a7cdbc2867

feacfd425186acf86237306c99d4c5a7cdbc2867 Pin puppetlabs-concat to 1.2.1 in fixtures
1a6ce2e16b329f8d735efd35270a176d6778ff86 Merge "New option replace_password for keystone_user"
6897fada5f0b51188c7a969f986859d787f7d7e4 Merge "Create a sync_db boolean for Keystone."
b0b4c591bc6a59feb344db566b754f195cda6a1a Fix keystone unit tests
ca7cacb2a37371b87243eb505c08bf5cd63ff275 Create a sync_db boolean for Keystone.
6cdc1731001c4d677242eef0eb670d5b57ea348a Makes distinct use of url vs auth_url
6db9a52cde33a60b5cec85e5bdee8119deca4973 New option replace_password for keystone_user

Change-Id: Ia013afa8677eb8ba94ffe83c05041ee0a4afe43d

Update manila to 41dc76b9518fb36b1217b89b4f605c99e00b7e1c

41dc76b9518fb36b1217b89b4f605c99e00b7e1c Pin puppetlabs-concat to 1.2.1 in fixtures

Change-Id: I3cb699b6df6ffc4fa6cfafe02511396186d91cc5

Update module-collectd to 1bd5110

1bd5110 Merge pull request redhat-openstack#250 from simonpasquier/fix-mysql-plugin-permissions
e9f42c2 Fix permission on MySQL plugin file
a47ffaf Merge pull request redhat-openstack#248 from pdxcat/fix_lint_warnings
70eb150 Fix Rakefile to enforce failure on warnings
d526993 Merge pull request redhat-openstack#247 from TheMeier/patch-1
85b646e Add Gemfile.lock
02e5305 Merge pull request redhat-openstack#241 from noris-network/master
2c928c8 Merge pull request redhat-openstack#242 from txaj/readme-contributing
e7a11f1 CreateFiles/CreateFilesAsync expect boolean values
8db34e6 Add a section to explain version scoping & known issue for redhat-openstack#162
859f05b allow to disable forwarding in network::server

Change-Id: I426108aec3185cfe4cec6300a5b5be5af0edba2b

Update mysql to 873dea3

873dea3 Merge pull request #699 from melan/master
6a79d26 references to README.md and default values were added to workaround warnings from puppet-lint
97c9eea Merge pull request #698 from mhaskel/MODULES-1928
298242e MODULES-1928 - allow log-error to be undef
eb3fa4e Merge pull request #697 from fraenki/freebsd_support
c2ec74b Merge pull request #687 from igalic/provider-regr
a2faed2 fix FreeBSD support for backups
1c3bf95 mysql backup: fix regression in mysql_user call

Change-Id: I80d29913a95bc6a6e534580614d2c8f01ab018c9

Update nova to 7f40c612d2fc25b9ceb91899c2c634e5e05ee3b9

7f40c612d2fc25b9ceb91899c2c634e5e05ee3b9 Pin puppetlabs-concat to 1.2.1 in fixtures
9271c137859a797d46939fb30d7684a11401acb5 Merge "Move rabbit/kombu settings to oslo_messaging_rabbit section"
ce1033f87176c789dac8e3cbaa99f4940edd0981 Merge "Add rspec coverage output"
2eda7208c4784043038bcdb316f0fbe0c76cd415 Merge "Adds OracleLinux support"
2f0f6659306262863c2d6abc5a64d268322f2354 Merge "move setting of novncproxy_base_url"
a5dcd4d34c22c51685ca54ca17f0f1c4695d1373 Add rspec coverage output
5d3c3c63efea1fb30dc9e1334ee8866025a68d1a Adds OracleLinux support
a8ba5a41cdbcbc5b4123cc97e0e46f4c7702b8fa Allow libvirt secret key setting from param
96eafbd792e2ceaa5ee972e85337fc1ff7d1f008 Move rabbit/kombu settings to oslo_messaging_rabbit section
28268ad9c74370b193efe8e972c808d76bb8c8d7 move setting of novncproxy_base_url

Change-Id: I872b1623a923af6573d12fad04d2ad4eafa62066

Update ntp to 060c453

060c453 Merge pull request redhat-openstack#260 from tphoney/leapfile_fix
7d30e16 fixing the tinker / panic unit tests
b6bb239 Added leapfile parameter
d654068 Merge pull request redhat-openstack#258 from mhaskel/update_stdlib_version
8f52991 Added dependency on stdlib 4.6.0
4412b3e Merge pull request redhat-openstack#257 from mhaskel/update_metadata
430ce7a PR redhat-openstack#255 added a dependency on stdlib >= 4.6.0
da5d844 Merge pull request redhat-openstack#255 from sorrowless/add_couple_options
75d47b4 Add tinker, stepout and poll options, change panic option
03d8b2c Merge pull request redhat-openstack#254 from juniorsysadmin/udlc-stratum
bbf6635 (MODULES-1837) Make udlc stratum configurable
789d47a Merge pull request redhat-openstack#253 from mhaskel/MODULES-1836
e2f7aa9 Add tests for the peers parameter
0b3eac9 MODULES-1836 - Added support for peers

Change-Id: Id1f060ca25d1e2911070dd382398141a19ab36c8

Update openstacklib to 423707b0f944ba052bb86a1cc23e5866a3640376

423707b0f944ba052bb86a1cc23e5866a3640376 Unpin rabbitmq module
8c1d56546ef41bf62c993cc96589f8052f81c737 Pin puppetlabs-concat to 1.2.1 in fixtures
11d033131e4cedfb42967730e2a761f0aaa75886 Correct wsgi_daemon_process_options key
331b89a4d9f49e3bc3ed84a17688e0b0800855e7 Merge "Targeting Keystone V3 API support"
d4073c27216a9432d9df312997be5fad91b4c0f5 Targeting Keystone V3 API support

Change-Id: I3453a16cdcbebb4431aa6a67d3de8b795b2d44a4

Update rabbitmq to 2c3fd7e

2c3fd7e Merge pull request #337 from fcharlier/limits_redhat
a46fb0c Add file_limit support for RedHat platforms
1a7859c Merge pull request #323 from jaxim/fix/master/MODULES-1856
87b665b Merge pull request #338 from scarby/master
27740db fixed type error rabbitmq_plugin does not have provider
f45bbcc Merge pull request #332 from tamaskozak/master
8bbfe32 Fix check_password function and use the standard rabbitmq api call instead
01aae16 MODULES-1856 - Fix to allow bindings and queues to be created on non-default management port

Change-Id: Idabd4b23bfc711c145b55f31616efebfdbf0faee

Update rsync to f8081918a503a7301772c93373eb70b90d399538

f8081918a503a7301772c93373eb70b90d399538 Merge pull request redhat-openstack#65 from mhaskel/add_tests_for_61
b80d86a9f6f88354dca9f931740608e1d05f9589 Test and make sure the service name is set correctly for SuSE
d80dbb59194c4c97939f78b320c0208d6f474a74 Update server.pp to work with SUSE OSs
c6ad435e8faf6a501f1815a92d7bb2deea384f77 Merge pull request redhat-openstack#64 from juniorsysadmin/fix-stdlib-dep
0235c98d1fc08b3e10670f1f66bf58e4b6e7635b Fix stdlib dependency version

Change-Id: I725e51d6e6ba8cf18421c0ae8dcf099428dafb34

Update sahara to 7dfdc87303f40bddd2fc72c974fbddb3d16f04d0

7dfdc87303f40bddd2fc72c974fbddb3d16f04d0 Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true

Change-Id: Ice10d66b755c3c1a270f55edfb19c74c6fecb34b

Update stdlib to 2a8d7ac

2a8d7ac Merge pull request #440 from DavidS/fix-error-message
c275134 fqdn_rand_string: fix argument error message
2c6cff6 Merge pull request #439 from puppetlabs/4.6.x
8a1d1e2 Merge pull request #314 from amateo/feature/loadyaml_check_file
73474b0 Merge pull request #438 from hunner/fix_date
ba4033e Fix the 4.6.0 release date
4c90e4d Merge pull request #437 from hunner/release_4.6.0
5382ca0 Prep for 4.6.0
ac24e7a test case for when the file does not exist
59b3fb4 Merge pull request #434 from bmjen/modules-2474
601e2e2 Modules-2474: Only runs enhanced salts functional test on systems that support it.
cf7dbef Merge pull request #433 from cmurphy/fix_acceptance
65116da Fix acceptance tests for #405
afec0ab Merge pull request #425 from jeffcoat/validate_augeas_spec
5ee6e96 Merge pull request #431 from bmjen/file-line-refactor
acf57bb Merge pull request #432 from cmurphy/fix_acceptance_undefined_var
e43f058 Fix unsupported platforms variable name in tests
0af0d7e Add spec tests and pulled in PR #427 Changed append line to open in 'w' mode and have to rewrite lines in order to append new line
35303ce file_line honors after if match not found.
f2fa4fb Merge pull request #430 from mhaskel/gjngeldenhuis-docupdate
ee2225b Clarifying behaviour of attributes and adding an extra example.
8fba5c0 Merge pull request #405 from elyscape/feature/fqdn_rand_strings
487e8d4 Merge pull request #408 from elyscape/feature/pw_hash
5ecfe2f Merge pull request #429 from DavidS/modulesync-configs-update
9a1fee6 Update Travis CI job from current modulesync_configs
23be402 (MODULES-1737) Add pw_hash() function
a82266c (MODULES-1715) Add fqdn_rand string generators
3fec51a Fix off-by-one error in validate_augeas_spec.rb that was causing rspec failure.
b9560df Check if file exists before loading with loadyaml. If not, return nil

Change-Id: Ic15cdfc909ba7af5dd20589543508fbf4b21c697

Update swift to f67877f1fa2dbb33702f61cee3c9df76ba541181

f67877f1fa2dbb33702f61cee3c9df76ba541181 Merge "read_affinity requires affinity sorting_method"
2737af141ac88a07cda39e402dacb4275792aa8f Pin puppetlabs-concat to 1.2.1 in fixtures
cb6aa56b545f0d47a8a89bcd4c903de2ddb21826 Merge "Fix ipv6 support"
ebb898656777444677584683cc8a0d2ac430eded Merge "Tag all Swift packages"
6dc85b0f7918fa295974f7afbb1a6b8a26f8f953 Notify services if swift.conf is modified
e04486fe46452978839b1c11a67d7fee59697106 read_affinity requires affinity sorting_method
06addb7b3b58289ae785c5bedc10682f3d959c3a Fix Rspec 3.x new is_expected.[to|to_not] keywords
9561ffffa21db52eca95e5682f0bbe6364994fdf Tag all Swift packages
b6ba9f09b291252a196d69c3e30b188fe77c2c4a Fix ipv6 support
7ad2a10e1fd5f78a6632cf76c8def3ae4559677e Update ssh module version

Change-Id: Idec1409778c021b7e60bdbdf6049069aa3283c82

Update tempest to 301f58f60317a816572596fce1f0093ad4f8e8e0

301f58f60317a816572596fce1f0093ad4f8e8e0 Add rspec coverage output

Change-Id: Ia2dc3f6a596d3c71ee49fc0939388b9d21ba4785

Update tripleo to e0921709d946d8db95f2a399a1b9da93d6b73d06

e0921709d946d8db95f2a399a1b9da93d6b73d06 Merge "Loadbalancer: Add support for Redis"
3bef84147bd7df52e8303bcb5481ce5d3351f997 Loadbalancer: Add support for Redis
72e8834efa188ecef879e5ae3141428b6a88f0a5 Rethink the backup option for Galera

Change-Id: I1b7a0e04ad2b0e9c2ef42350e21ca0586df7cfb1

Update vcsrepo to 210ca5acd8eecc909eae248745e24f0debd66ffc

210ca5acd8eecc909eae248745e24f0debd66ffc Merge pull request redhat-openstack#243 from rnelson0/quotes
c858962ef98782f261043c4d5d6dd2ab182afaec Enforce the style guide's recommendation of single quotes as the default.

Change-Id: I294108b76896a7110fbc1fe7e4126037c3f2c8e4

Update vswitch to 5079b23938aa2d98dea86e89c05194fd3deb3a29

5079b23938aa2d98dea86e89c05194fd3deb3a29 Add puppet-lint-param-docs plugin
e895b0d641e8e1e519f4087e58a77550b13ad86d spec: updates for rspec-puppet 2.x and rspec 3.x
da6eaa1d3ad0adea95efc9c3fc6b63423feb4b29 Add Puppet 4.x lint checks
7d83f160ccae89c8cd6ffded4a37ebcf39b13798 Fix metadata.json lint issues

Change-Id: I20367bc9ec30ca2a0cce47875d58c2d4b73bbf66

Update xinetd to 4f16fc824e04d724a486634bd9c26ef549f10ff5

4f16fc824e04d724a486634bd9c26ef549f10ff5 Merge pull request redhat-openstack#56 from mhaskel/rebase_31
b23fe88578ffb5f44b1cb1b59bd079479e3bcb31 Removed default vaules from xinetd.conf and added params for each

Change-Id: Id6d2cf9d0f0c0daa4ae7bd4b22b34167079049d7
  • Loading branch information
@xbezdick
xbezdick committed Apr 20, 2015
1 parent 001dc0a commit d3aa910
Show file tree
Hide file tree
Showing 248 changed files with 3,796 additions and 2,506 deletions.
54 changes: 27 additions & 27 deletions Puppetfile
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
mod 'apache',
:commit => 'dc26c77d8890af0df5063b021b52cd91eddaca56',
:commit => '8df51aafe71921181999a9f3d1845ce2d98acb8f',
:git => 'https://github.com/puppetlabs/puppetlabs-apache.git'

mod 'aviator',
:commit => '9a3b74b0dbb655a3afcbc8bdee442f2143420b72',
:git => 'https://github.com/aimonb/puppet_aviator.git'

mod 'ceilometer',
:commit => '8d17c36818d99231a64d20f50ea708d59306fe22',
:commit => '0ec70ff60f620a1af29ae64a646ee7e5ad98ebb9',
:git => 'https://github.com/stackforge/puppet-ceilometer.git'

mod 'certmonger',
:commit => '3f86b9973fc30c14a066b0f215023d5f1398b874',
:git => 'https://github.com/rcritten/puppet-certmonger.git'

mod 'cinder',
:commit => 'a6727a0d235b40b89891767e5ead133678e60ec2',
:commit => 'cc7279832bb7bd2840c831219f5f00a0f2efb8a3',
:git => 'https://github.com/stackforge/puppet-cinder.git'

mod 'common',
:commit => '165e2adc3ab559597f461e6eae3eb004967070f9',
:git => 'https://github.com/purpleidea/puppet-common.git'

mod 'concat',
:commit => '52d0f1d6809c9f1d8453f9e3ca10d792e67acc89',
:commit => '30cb251b8699028a7b15c2b855f62ba5ce276401',
:git => 'https://github.com/puppetlabs/puppetlabs-concat.git'

mod 'firewall',
Expand All @@ -35,27 +35,27 @@ mod 'galera',
:git => 'https://github.com/redhat-openstack/puppet-galera.git'

mod 'glance',
:commit => '9c1b0a90d93913548dbada13076cac1470cc5993',
:commit => 'c0feafd0e9705870349b6b75ef1727ddd6b81035',
:git => 'https://github.com/stackforge/puppet-glance.git'

mod 'gluster',
:commit => '467620e575b8b8fb42d1980f97ae1b5863641483',
:commit => '4b96b871dc414727160b51a7a454c518382ea9aa',
:git => 'https://github.com/purpleidea/puppet-gluster.git'

mod 'gnocchi',
:commit => '4438badb1499ceed11b32287f861de2ce5961122',
:commit => '135849d3f11592f6e6b1d4d86ac161a265ad3d28',
:git => 'https://github.com/stackforge/puppet-gnocchi.git'

mod 'haproxy',
:commit => '957437013add0c92d6ff934de942867e304036f0',
:commit => '33ceaf932fb694e54fc3d917580e2c89e40f0ae7',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'

mod 'heat',
:commit => 'bbeb24c51aa3573300a74fbcaf80d8fce3e2b8f7',
:commit => '80e16dc9758ee6307f99ad3a14d5d26d70629fcd',
:git => 'https://github.com/stackforge/puppet-heat.git'

mod 'horizon',
:commit => '4155185fef6d566246796d448c9e1c2557f4481c',
:commit => '32ed597ccc069086bcb0a0e1e722638072d18fcf',
:git => 'https://github.com/stackforge/puppet-horizon.git'

mod 'inifile',
Expand All @@ -71,19 +71,19 @@ mod 'ironic',
:git => 'https://github.com/stackforge/puppet-ironic.git'

mod 'keystone',
:commit => '4f684b24dbd8a089bd542f2767ab56ba2aea6654',
:commit => 'feacfd425186acf86237306c99d4c5a7cdbc2867',
:git => 'https://github.com/stackforge/puppet-keystone.git'

mod 'manila',
:commit => 'cf654ec8d6f693ec353562a57718add762f167dd',
:commit => '41dc76b9518fb36b1217b89b4f605c99e00b7e1c',
:git => 'https://github.com/stackforge/puppet-manila.git'

mod 'memcached',
:commit => 'e0e9c024dc4ed6f049d68ad3f2cc3ee9666e7277',
:git => 'https://github.com/saz/puppet-memcached.git'

mod 'module-collectd',
:commit => '91e1dafad3182e64979dfeba1633f0b32bcc0649',
:commit => '1bd511019fe1da9b305b259862aa27516f083be6',
:git => 'https://github.com/pdxcat/puppet-module-collectd.git'

mod 'module-data',
Expand All @@ -95,7 +95,7 @@ mod 'mongodb',
:git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'

mod 'mysql',
:commit => '5de035c60d899df305e1f3e30267726895d055da',
:commit => '873dea342fd05821e4998c10066b99bdf25777e6',
:git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'

mod 'n1k_vsm',
Expand All @@ -111,23 +111,23 @@ mod 'neutron',
:git => 'https://github.com/stackforge/puppet-neutron.git'

mod 'nova',
:commit => 'c191303e6b368f0124e27b6545595a69fd188662',
:commit => '7f40c612d2fc25b9ceb91899c2c634e5e05ee3b9',
:git => 'https://github.com/stackforge/puppet-nova.git'

mod 'nssdb',
:commit => '2e163a21fb80d828afede2d4be6214f1171c4887',
:git => 'https://github.com/rcritten/puppet-nssdb.git'

mod 'ntp',
:commit => '286acbacdb9aaa3f1255d7486078730e380195f4',
:commit => '060c453a9bbd87d1bf229db70ee6367033a2910e',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp'

mod 'openstack_extras',
:commit => 'c9621fb6c08aa8621661ae6c88a25de6a4142e71',
:git => 'https://github.com/stackforge/puppet-openstack_extras.git'

mod 'openstacklib',
:commit => 'e76240c180f969fda194f295496421cbc1e4352a',
:commit => '423707b0f944ba052bb86a1cc23e5866a3640376',
:git => 'https://github.com/stackforge/puppet-openstacklib.git'

mod 'pacemaker',
Expand All @@ -143,7 +143,7 @@ mod 'qpid',
:git => 'https://github.com/dprince/puppet-qpid'

mod 'rabbitmq',
:commit => '7dd5c7420f823babe3baf88bec67c8e43760d00e',
:commit => '2c3fd7ea004272257b8efaa098cd2ea18b2b7751',
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'

mod 'redis',
Expand All @@ -155,11 +155,11 @@ mod 'remote',
:git => 'https://github.com/paramite/puppet-remote.git'

mod 'rsync',
:commit => '699650bf7e7339e1653f83143637595a0029aa51',
:commit => 'f8081918a503a7301772c93373eb70b90d399538',
:git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'

mod 'sahara',
:commit => '303e514db06b34db1ab26e84edbbdf91d98d6679',
:commit => '7dfdc87303f40bddd2fc72c974fbddb3d16f04d0',
:git => 'https://github.com/stackforge/puppet-sahara.git'

mod 'ssh',
Expand All @@ -171,46 +171,46 @@ mod 'staging',
:git => 'https://github.com/nanliu/puppet-staging.git'

mod 'stdlib',
:commit => '14a02ea21e14111071a921e82cdf3cd1f518c7f3',
:commit => '2a8d7acd7e8ce84826cb8293308721fe7b4095ea',
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'

mod 'swift',
:commit => '96ad9dd2237d9d9165025fd76e3c4b7f348ea2f1',
:commit => 'f67877f1fa2dbb33702f61cee3c9df76ba541181',
:git => 'https://github.com/stackforge/puppet-swift.git'

mod 'sysctl',
:commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
:git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'

mod 'tempest',
:commit => '098c4b855e5a6da843bae057d56afd89b171894f',
:commit => '301f58f60317a816572596fce1f0093ad4f8e8e0',
:git => 'https://github.com/stackforge/puppet-tempest.git'

mod 'timezone',
:commit => '0b3e3f06c7c3c4e4ab571666cceb7f4779e69856',
:git => 'https://github.com/saz/puppet-timezone.git'

mod 'tripleo',
:commit => '6f5c208f8df4df034637acd1b5fd6f4b71012d8a',
:commit => 'e0921709d946d8db95f2a399a1b9da93d6b73d06',
:git => 'https://github.com/stackforge/puppet-tripleo.git'

mod 'trove',
:commit => '27f3940b92d803e18bbad37a40533bdeeab0a85e',
:git => 'https://github.com/stackforge/puppet-trove'

mod 'vcsrepo',
:commit => '3d4547646d49295c91bb002fa885e187c2d89feb',
:commit => '210ca5acd8eecc909eae248745e24f0debd66ffc',
:git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'

mod 'vlan',
:commit => 'c937de75c28e63fba8d8738ad6a5f2ede517e53d',
:git => 'https://github.com/derekhiggins/puppet-vlan.git'

mod 'vswitch',
:commit => '331726326a275da158a62cafdd49fb961a71d3e2',
:commit => '5079b23938aa2d98dea86e89c05194fd3deb3a29',
:git => 'https://github.com/stackforge/puppet-vswitch.git'

mod 'xinetd',
:commit => '5e31388979e8f3a667899fad5cefa95289e22281',
:commit => '4f16fc824e04d724a486634bd9c26ef549f10ff5',
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd.git'

4 changes: 3 additions & 1 deletion apache/.fixtures.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
fixtures:
repositories:
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
concat:
repo: "git://github.com/puppetlabs/puppetlabs-concat.git"
branch: "1.2.x"
portage: "git://github.com/gentoo/puppet-portage.git"
symlinks:
apache: "#{source_dir}"
22 changes: 13 additions & 9 deletions apache/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,10 @@ Sets the amount of time the server waits for subsequent requests on a persistent

Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.

#####`lib_path`

Specifies the location where apache module files are stored. It should not be configured manually without special reason.

#####`loadfile_name`

Sets the file name for the module loadfile. Should be in the format *.load. This can be used to set the module load order.
Expand Down Expand Up @@ -811,9 +815,9 @@ Installs Apache mod_status and uses the status.conf.erb template. These are the

```puppet
class { 'apache::mod::status':
allow_from = ['127.0.0.1','::1'],
extended_status = 'On',
status_path = '/server-status',
allow_from => ['127.0.0.1','::1'],
extended_status => 'On',
status_path => '/server-status',
){
Expand All @@ -826,9 +830,9 @@ Installs Apache mod_expires and uses the expires.conf.erb template. These are th

```puppet
class { 'apache::mod::expires':
expires_active = true,
expires_default = undef,
expires_by_type = undef,
expires_active => true,
expires_default => undef,
expires_by_type => undef,
){
Expand All @@ -839,7 +843,7 @@ Installs Apache mod_expires and uses the expires.conf.erb template. These are th

```puppet
class { 'apache::mod::expires':
expires_by_type = [
expires_by_type => [
{ 'text/json' => 'access plus 1 month' },
{ 'text/html' => 'access plus 1 year' },
]
Expand Down Expand Up @@ -868,8 +872,8 @@ To specify an alternate mod\_wsgi package name to install and the name of the mo
wsgi_socket_prefix => "\${APACHE_RUN_DIR}WSGI",
wsgi_python_home => '/path/to/venv',
wsgi_python_path => '/path/to/venv/site-packages',
package_name => 'python27-mod_wsgi',
mod_path => 'python27-mod_wsgi.so',
package_name => 'python27-mod_wsgi',
mod_path => 'python27-mod_wsgi.so',
}
```

Expand Down
27 changes: 27 additions & 0 deletions apache/lib/puppet/parser/functions/validate_apache_log_level.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
module Puppet::Parser::Functions
newfunction(:validate_apache_log_level, :doc => <<-'ENDHEREDOC') do |args|
Perform simple validation of a string against the list of known log
levels as per http://httpd.apache.org/docs/current/mod/core.html#loglevel
validate_apache_loglevel('info')
Modules maybe specified with their own levels like these:
validate_apache_loglevel('warn ssl:info')
validate_apache_loglevel('warn mod_ssl.c:info')
validate_apache_loglevel('warn ssl_module:info')
Expected to be used from the main or vhost.
Might be used from directory too later as apaceh supports that
ENDHEREDOC
if (args.size != 1) then
raise Puppet::ParseError, ("validate_apache_loglevel(): wrong number of arguments (#{args.length}; must be 1)")
end

log_level = args[0]
msg = "Log level '${log_level}' is not one of the supported Apache HTTP Server log levels."

raise Puppet::ParseError, (msg) unless log_level =~ Regexp.compile('(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])')

end
end
3 changes: 0 additions & 3 deletions apache/manifests/dev.pp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
class apache::dev {
if $::osfamily == 'FreeBSD' and !defined(Class['apache::package']) {
fail('apache::dev requires apache::package; please include apache or apache::package class first')
}
include ::apache::params
$packages = $::apache::params::dev_packages
if $packages { # FreeBSD doesn't have dev packages to install
Expand Down
6 changes: 2 additions & 4 deletions apache/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
$mod_dir = $::apache::params::mod_dir,
$mod_enable_dir = $::apache::params::mod_enable_dir,
$mpm_module = $::apache::params::mpm_module,
$lib_path = $::apache::params::lib_path,
$conf_template = $::apache::params::conf_template,
$servername = $::apache::params::servername,
$manage_user = true,
Expand Down Expand Up @@ -124,10 +125,7 @@
}
}

$valid_log_level_re = '(emerg|alert|crit|error|warn|notice|info|debug)'

validate_re($log_level, $valid_log_level_re,
"Log level '${log_level}' is not one of the supported Apache HTTP Server log levels.")
validate_apache_log_level($log_level)

class { '::apache::service':
service_name => $service_name,
Expand Down
2 changes: 1 addition & 1 deletion apache/manifests/mod.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$package = undef,
$package_ensure = 'present',
$lib = undef,
$lib_path = $::apache::params::lib_path,
$lib_path = $::apache::lib_path,
$id = undef,
$path = undef,
$loadfile_name = undef,
Expand Down
6 changes: 3 additions & 3 deletions apache/manifests/mod/expires.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
::apache::mod { 'expires': }

# Template uses
# $expries_active
# $expries_default
# $expries_by_type
# $expires_active
# $expires_default
# $expires_by_type
file { 'expires.conf':
ensure => file,
path => "${::apache::mod_dir}/expires.conf",
Expand Down
2 changes: 1 addition & 1 deletion apache/manifests/mod/wsgi.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if $mod_path =~ /\// {
$_mod_path = $mod_path
} else {
$_mod_path = "${::apache::params::lib_path}/${mod_path}"
$_mod_path = "${::apache::lib_path}/${mod_path}"
}
::apache::mod { 'wsgi':
package => $package_name,
Expand Down
2 changes: 1 addition & 1 deletion apache/manifests/mpm.pp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define apache::mpm (
$lib_path = $::apache::params::lib_path,
$lib_path = $::apache::lib_path,
$apache_version = $::apache::apache_version,
) {
if ! defined(Class['apache']) {
Expand Down
10 changes: 8 additions & 2 deletions apache/manifests/package.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
$ensure = 'present',
$mpm_module = $::apache::params::mpm_module,
) inherits ::apache::params {

# The base class must be included first because it is used by parameter defaults
if ! defined(Class['apache']) {
fail('You must include the apache base class before using any apache defined resources')
}

case $::osfamily {
'FreeBSD': {
case $mpm_module {
Expand Down Expand Up @@ -44,10 +50,10 @@
before => Package['httpd'],
}
}
$apache_package = $::apache::params::apache_name
$apache_package = $::apache::apache_name
}
default: {
$apache_package = $::apache::params::apache_name
$apache_package = $::apache::apache_name
}
}

Expand Down

0 comments on commit d3aa910

Please sign in to comment.