Skip to content

Commit

Permalink
Sync opm puppet modules to latest upstream masters
Browse files Browse the repository at this point in the history 
Update apache to bf061e6

bf061e6 Merge pull request #1124 from genebean/IndexStyleSheet_Support
223b18b Add ability to unittest puppet 4
749b223 Merge pull request #1118 from sathieu/authn_core
6f36686 Move authn_core module to a class
53a0d73 Added the ability to define the IndexStyleSheet setting for a directory
421adf5 Merge pull request #1096 from igalic/log_reject
1962d73 Merge pull request #1121 from carroarmato0/master
d7426c0 Merge pull request #1129 from ckaenzig/fix-readme-def-val
e98359b Add basic initial support for SLES 11
91d23fd Do not offload overriding LogFormats to httpd
740429e Fix in README.md for default values of php_flags

Change-Id: Iff480eedec813f2d11682c3577e7aeefcad1766e

Update ceilometer to 264ea1b

264ea1b Fix dependency on nova-common package

Change-Id: I479209fbec04fde43ad3f2514a9d2cb25f4716be

Update cinder to 4785c1c739f19c4874d0ba24f14e34b6f0d06375

4785c1c739f19c4874d0ba24f14e34b6f0d06375 Merge "Bring Redhat support to acceptance tests"
a13f03363e6f930e882dd0ba90868df18c3e9f26 Merge "Beaker: install APT repo with openstack_extras"
4b95903f0962a560325958ca3dd7a6297bbbc063 Bring Redhat support to acceptance tests
0dd2d78bd3b0e664a38c6984bca69eaf2635535f Beaker: install APT repo with openstack_extras

Change-Id: I1486da641dd15c903155faae3f30dbbfc5006611

Update firewall to cbfca92

cbfca92 Add ability to unittest puppet 4
35d2e40 Merge pull request #534 from puppetlabs/1.6.x
2fd4e70 Merge pull request #533 from jbondpdx/1.6.x
5338ff9 DOCS: edits to firewall readme
4986cef 1.6.0 Release Prep
dbcfba0 Merge pull request #532 from jonnytpuppet/jbb_issue_1766
3b4c2cc Updated readme for clamp_mss_to_pmtu
f5954dd Merge pull request #531 from jonnytpuppet/jbb_issue_1766
2add7c5 Add support for clamp-mss-to-pmtu

Change-Id: I2db9a9d7dcd925f01d233ea80b00d9b5cb9b8513

Update galera to 26016bc260b6d1101201dd1ca791deb1a5fcf2cf

26016bc260b6d1101201dd1ca791deb1a5fcf2cf Deprecate mysql::server resource creation

Change-Id: If1ed916cf061598222e9fc70fdc82ad200418bfe

Update glance to c76d39605ff311eaba6ca226ac7dac19f86279ed

c76d39605ff311eaba6ca226ac7dac19f86279ed Decouple sync_db from manage_service and enabled

Change-Id: I8a7f3e0ea6d116c5882a7adf0683b2368aa3547c

Update haproxy to 3007560fc47da48d576890b1823e0ccfac3d9207

3007560fc47da48d576890b1823e0ccfac3d9207 Add ability to unittest puppet 4
e6bd52b6effdc436e8f065964478c58ca3f43a0a Merge pull request redhat-openstack#183 from tphoney/ignore_log
3988b38bae9427a7a0e78b2cc0b31028d842e2c2 ignore the log directory
cc701aeff2bd963239567a3dd69ca93dfdaad2a5 Merge pull request redhat-openstack#180 from voroniys/master
6da0a5badc7120108e70d898895136c44994ce53 Merge pull request redhat-openstack#182 from psoloway/readme
4c79f0120587f2894d2ffaf41453194aa83c0727 Apply changes from @hunner
0874c8242c5093f7cdac46c4401fc887560dba08 Rewrite README per DOC-1499
ee82979d53dc7139815547ffd2c00ca6d4023907 Update params.pp

Change-Id: Iccf3e320fc7dd8e3e6365f6639f34554c190a398

Update heat to 01004884a1a4d3e2e5fac779975ddc18fec034cd

01004884a1a4d3e2e5fac779975ddc18fec034cd Bring Redhat support to acceptance tests
1750f36a066031ec1910cf0665c53173d51ba8de Beaker: install APT repo with openstack_extras

Change-Id: Ic918405dbd525c232576558b3d0fddb40459d027

Update horizon to b975b22d97f5b794160bfdd5c4190990e8496331

b975b22d97f5b794160bfdd5c4190990e8496331 Bring Redhat support to acceptance tests
c566f7a75c1590b7684ba03a39321043dba11c12 Beaker: install APT repo with openstack_extras

Change-Id: I61df22be921d962b20b61af8e3ec6554ca594f4a

Update inifile to c72bfbb

c72bfbb Merge pull request redhat-openstack#129 from duritong/create_ini_settings
4da2f6e Add ability to unittest puppet 4
9f03e8a remove dead code
6eb8f9c introduce create_ini_settings

Change-Id: I7eb29a96d9246c5c21ad601b6ca6890b112b15fd

Update ironic to 78e0dc117ee77275f40dcda8dd060f1d6ca06499

78e0dc117ee77275f40dcda8dd060f1d6ca06499 Bring Redhat support to acceptance tests
fc6b14d838b135924e010b7aa35a7a7de889c690 Beaker: install APT repo with openstack_extras

Change-Id: Iacf9e2a7729be5f0a9dc917e0370a9d45198122e

Update keystone to eb240c5aa120d428567fb7c239167def96b6b75f

eb240c5aa120d428567fb7c239167def96b6b75f Merge "Decouple sync_db from enabled"
3c08645ba8b894d3adce3d65464dd43a0a33ce55 Decouple sync_db from enabled
e8a09f76075b8d780e2f6b1b2d8fb3a19f6f94ee Bring Redhat support to acceptance tests
a20b6098ace51832b1682cba295d2e8755231d54 Beaker: install APT repo with openstack_extras

Change-Id: I7f9a76d5bc1cf78809ef6599023b04f7d59214a1

Update manila to ce1fa24cfdbb1073a1fedbb373b690b92b35c43f

ce1fa24cfdbb1073a1fedbb373b690b92b35c43f Bring Redhat support to acceptance tests
64240b02ddf888a5def1c599effe739f0472eb18 Beaker: install APT repo with openstack_extras

Change-Id: Id0fc5f4ccdaedd83a4f5b9990f75b3ee5a42617e

Update memcached to f6dd071

f6dd071 new release v2.8.0
50242e2 fix memcached_sysconfig template
9d6b9f6 remove useless quotes
43485a8 Merge branch 'master' of git://github.com/mmarseglia/puppet-memcached into mmarseglia-master
5f3efdc Merge branch 'vshn-feature-no-listen'
6e774c8 Merge branch 'feature-no-listen' of https://github.com/vshn/puppet-memcached into vshn-feature-no-listen
2fb653a Merge branch 'enovance-service_manage'
e6718d6 Merge branch 'service_manage' of git://github.com/enovance/puppet-memcached into enovance-service_manage
b0b6669 Revert "Merge pull request redhat-openstack#55 from mattkenn4545/master"
fbe8ebd Merge pull request redhat-openstack#55 from mattkenn4545/master
11ef5ef Revert "Merge pull request redhat-openstack#54 from covermymeds/multi_memcached"
cca1bb8 Revert "cleanup some multi instance things"
0e45c9a cleanup some multi instance things
b8375f9 Merge pull request redhat-openstack#54 from covermymeds/multi_memcached
f4b539d feature: Add possibilty to configure no listen_ip.
bf3b9c6 Rebase from saz/master
573f8ec Add a $service_manage boolean
e7979de Updates to run multiple instances of memcached.
af4672c Convert logfile to bool in if statement
2475a37 add support for logging to syslog. Added boolean parameter syslog. If syslog is true and logfile is empty then configure sysconfig options to pipe output to /bin/logger.
b447489 Add ability to specify max object size. (-I)

Change-Id: I30bb8e06067e64a949bc7564e7a8d57e0b997c85

Update module-collectd to 27c81f6

27c81f6 Merge pull request redhat-openstack#267 from arioch/master
11f42ad Fix python plugin template indentation

Change-Id: I443d0af54fa08a69a0c288341a5670fee3111933

Update mongodb to 14117ae3391862021555df8139c66fd04c13c0c3

14117ae3391862021555df8139c66fd04c13c0c3 Add ability to unittest puppet 4

Change-Id: Icbb98782c4c59b3b034a9e750ce8e821b9d9a460

Update mysql to 5f76233

5f76233 Merge pull request #719 from enovance/package_dependency
9215c5d Add ability to unittest puppet 4
29788fb (MODULES-2077) Fixes wrong dependency variable
31f0c4f Merge pull request #718 from igalic/slalomzacharyd-fixed-for-mariadb
4bab65e Fixed server package name so it isn't hardcoded to mysql
18e45a0 Merge pull request #717 from puppetlabs/3.4.x
3ec3d79 Merge pull request #715 from jbondpdx/3.4.x
4cd07c0 DOCS: minor edits to mysql readme
609a8d0 3.4.0 Release Prep
6572601 Merge pull request #712 from jewjitsu/freebsddefaults
dc9dcee update to proper defaults for freebsd
6639efc Merge pull request #711 from cyberious/master
d3901f2 (fix) - Change default for mysql::server::backup to ignore_triggers => false - Update spec acceptance test to check for which version is currently installed prior to testing
61c5372 Merge pull request #709 from cyberious/master
9dad94a (fix) - Fix issue where fact is unknown at start - Resolve issue where if known and failed versioncmp would result in idempotency issue on second run

Change-Id: I900c8cafe905fbdbf34ce2102ef88c4cc4887de2

Update neutron to dea7f4719fea5529d916ef4cae56020e8ee4efea

dea7f4719fea5529d916ef4cae56020e8ee4efea Merge "Fixed deprecation warning message"
50a3a29b8e0dd72a69d0a30c01b79805ff5e6f2b Merge "Beaker: install APT repo with openstack_extras"
25b9825c7c756afe88bb3cf714801ec91f15b23d Fixed deprecation warning message
340186e2edabab44d3d9cf7ceeebe80bb8c30780 Fix avalaible/available typo
3f2ec9002a0d66859794d50d5af7a5c49ae33581 Beaker: install APT repo with openstack_extras

Change-Id: Ic2eefd5b67bef9603d8637328778d7ee02f78c80

Update nova to f4330488dd503562ba936c2f14d23e6af3ee9fca

f4330488dd503562ba936c2f14d23e6af3ee9fca Merge "Fix variable access in RBD secret template"
ad71c7c590ea8e8d09ea5cb23ea9f18eed9504e7 Fix variable access in RBD secret template
7d1171986eb7a6115c35ebb3d8bba155ca8ecd04 Ensure /etc/nova exists before creating secret.xml
d427bd2929adb8e5f7bfdd96ff54be38e6dbbbbb Merge "Add vagrant nodeset and make it the default"
1506d64c599167b68dee10dc94d2180806c92c63 Bring Redhat support to acceptance tests
e8aeca9273309394cb1e82d5bcd6ea9284c96473 Beaker: install APT repo with openstack_extras
dc2eb5518e382d04a960cbe254181ed8dc39c9af Use correct name on el7+
ece6fd253814646fcd1bb81939d1d591303d2e0c Merge "Fix RSpec3.x keywords"
cfc6ec77473273b166c1e02c54bc39f57ad83362 Add vagrant nodeset and make it the default
34ec23cff5a2a378206a32474fce36ecf8f6f12c Fix RSpec3.x keywords

Change-Id: Id334491ec164b3866349ecc326dffeb2570c39af

Update ntp to c061325

c061325 Add ability to unittest puppet 4
55fb2cf Merge pull request redhat-openstack#266 from puppetlabs/4.0.x
5b03aec Release Prep 4.0.0

Change-Id: I7ad18ca8b49b8596c6aea2e64fc03c874d3f2091

Update openstacklib to d0de990f92a9a9cb7f705ecd39dd8aa02d02bf48

d0de990f92a9a9cb7f705ecd39dd8aa02d02bf48 Bring Redhat support to acceptance tests

Change-Id: I549c4ede5837ccfaf4afb927325a29c22fe68a4b

Update rabbitmq to d3c6971

d3c6971 Add ability to unittest puppet 4
76261d3 Merge pull request #357 from puppetlabs/5.2.1
725cd02 Release Prep 5.2.1
a161e26 Merge pull request #344 from nnathan/update_policy_doc
7b9c243 Merge pull request #351 from enovance/fix-idempotency
0227f76 Ensure idempotency between Puppet runs
2d22427 Pins apt version for ci
ce8c9a5 update doc: s/myhost/myvhost/ -- myvhost is easier to understand because it is self-describing

Change-Id: I06135f3fa7205ce7f2f4881f690ad9c050fec7bb

Update redis to aa13ac9

aa13ac9 Enable to not manage the Redis service

Change-Id: I422bb9e7715cfb2e42531b3809457b6a6ab543af

Update sahara to 326860e6244927474f458e5df220abcb59049576

326860e6244927474f458e5df220abcb59049576 Fixed /etc/sahara handling
126a34d4402337019d6172adf6ea2349345c2efd Bring Redhat support to acceptance tests
4c5fc5e3bb6185fd7e04beb17202f2deb342d5f4 Beaker: install APT repo with openstack_extras
9de78136d18d9ea9b821f2da0a6c24428611c64b Idempotency fix

Change-Id: Ifdc1d756cd6d32847159d30dff95e3b45bb72476

Update stdlib to 4a8c0a5

4a8c0a5 Merge pull request #463 from CENGN/fix/master/file_line_multiple_after
72089f3  (MODULES-2071) Refactor file_line provider to contain logic to handle parameter multiple in function handle_create_with_after
c9b810c Merge pull request #461 from DavidS/validate-hashes
cf9f7a6 validate_integer, validate_numeric: explicitely reject hashes in arrays
b409018 Add ability to unittest puppet 4
3fafad8 Merge pull request #460 from DavidS/fix-fqdn_rotate-seed
0dc0e0d fqdn_rotate: reset srand seed correctly on old ruby versions
6cf64f1 Merge pull request #454 from elyscape/document_facts.d_cache
06ebdf3 Merge pull request #455 from hunner/change_type_of_test
1401e26 Merge pull request #458 from ghoneycutt/patch-1
48e516b Update CHANGELOG.md
97ee232 Merge pull request #456 from jtappa/readme-edits
593f74c DOC-1504: README edits
732f7e8 Remove all the pops stuff
3b8ded1 (FM-2130) Document new location of facts.d cache

Change-Id: I3e77b6190aadb0ad0ae4a930124a590346b1d71c

Update swift to ef9f9a4194237b3cd00446f42d1b407d203cbfd5

ef9f9a4194237b3cd00446f42d1b407d203cbfd5 Handle both string and array for memcache param.
3ceea9fa89cfe9c26c79146479a97c2519c332f7 Fix concat file mode
d05d97d39ecca61dcd7a1b1fd110758ad56d0de4 Bring Redhat support to acceptance tests
7483eaf336d1fb08e349ffd942c86d6a9078b9ad Beaker: install APT repo with openstack_extras
49fd248002605b80a51a35d254fdfca0736502e5 mount.pp: fix lint issue

Change-Id: Ia23318812b23b91ce390ecd8b88409e3e853f1b2

Update tempest to d46a0c403ee9adcdc2a694c609d9bb6fe3b5a05f

d46a0c403ee9adcdc2a694c609d9bb6fe3b5a05f Bring Redhat support to acceptance tests

Change-Id: I02dad49d8c61534a34177897b84791146f91afb4

Update trove to 16e82e68ea62efec3ec7e11d7b9887e16b773372

16e82e68ea62efec3ec7e11d7b9887e16b773372 CentOS 7 compatibility
bd16e3dbe597dcea9506c611f4a98926578176db Bring Redhat support to acceptance tests
29be41ed02a4adda3d4012dcf0c0c9677dd7cb8d Beaker: install APT repo with openstack_extras
c9ff84d3e4aed8f9d91ea12d704cec633e5bf2a0 Document requirement to use separate RabbitMQ

Change-Id: Ia54717d9bdb6bf75cb494a9eb4438c1bf9316868

Update vcsrepo to 18b91b2f51a1cd8cd6911bd981e4629dd0d407e8

18b91b2f51a1cd8cd6911bd981e4629dd0d407e8 Merge pull request redhat-openstack#232 from netors/master
8f47c4e744992a70028a4a744ae654d6fd6d7233 Add ability to unittest puppet 4
118eb7bcbdc85e9b6d3778e4536b6940a3d23087 Merge pull request redhat-openstack#251 from mhaskel/merge_1.3.x_to_master
e94d67588b368ae51671d777e0f0e53d24e28dea Merge branch 'psoloway-readme' into 1.3.x
f900efd909155c7a9c1d6d74f63d9e919436ccec Last-minute README corrections
3d3220033fd8be6d7314f995a087d72654d4b8cd Merge pull request redhat-openstack#249 from hunner/release_1.3.0
f555eaf0e34650b72550055c9fa9d60292e9f276 Release 1.3.0
aff1a289608cbba1249c17f7662f3e3f0fe646ab Merge pull request redhat-openstack#246 from psoloway/readme
aaa5d87d966df4c4f7d54ca4fd878ac794a8dc8f Merge pull request redhat-openstack#248 from hunner/fix_tmp
7f97a76f4682a7c1d5bfbbc3cd5a6dd9523b1d96 (MODULES-821) Don't use /tmp
5998ab9ad89ca7c2926cef4b09f46e954f734aea Merge upstream changes into readme branch
b1e0a48fa095aac7d2aea01f616a164890a10c2d Update README per DOC-1501
56852e9cbf93c3f6f5db7dcdd40b3d364b548182 Bugfix: removed duplicated condition
cf5c8e6e9fb46115d59ec4e3b5d433e29168fe00 Added submodules true condition before update_submodules on revision method

Change-Id: I19956d6327fbe188c49df6d8252dd2c9fc835e17

Update vswitch to 8bdf36261b7f25ac0f0af84804d102db0ba51007

8bdf36261b7f25ac0f0af84804d102db0ba51007 make dkms on Debian/Ubuntu optional, add tests

Change-Id: Ifed08109d5780bfd83b1ebaac947afd7bb7961e8

Update xinetd to 1420bf2bf2462a95185e9d2fffdf0a93edd8c7dc

1420bf2bf2462a95185e9d2fffdf0a93edd8c7dc Merge pull request redhat-openstack#51 from ghoneycutt/style
6a91977fe4d82518c5d608a5255267ed6b618fcd Style change to appease puppet-lint

Change-Id: I35cf2048bcb9ae21c00c2f93fd11b43f4e5adb6b
  • Loading branch information
@xbezdick
xbezdick committed May 29, 2015
1 parent de52e3a commit 41eeefb
Show file tree
Hide file tree
Showing 178 changed files with 3,165 additions and 1,731 deletions.
62 changes: 31 additions & 31 deletions Puppetfile
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
mod 'apache',
:commit => '18a33383dc11a9f264db97a1b98a05dc661c6808',
:commit => 'bf061e66d10ff595799e13945832948e0a538cea',
:git => 'https://github.com/puppetlabs/puppetlabs-apache.git'

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

mod 'ceilometer',
:commit => 'c6f69adf40a95595c362c3cce0bae700ec223b85',
:commit => '264ea1b19155bb2f34a95858b18442c14504ddf2',
:git => 'https://github.com/stackforge/puppet-ceilometer.git'

mod 'ceph',
Expand All @@ -19,7 +19,7 @@ mod 'certmonger',
:git => 'https://github.com/rcritten/puppet-certmonger.git'

mod 'cinder',
:commit => '24bb8f7b326eec428907fb104dd56e4240b5a5d4',
:commit => '4785c1c739f19c4874d0ba24f14e34b6f0d06375',
:git => 'https://github.com/stackforge/puppet-cinder.git'

mod 'common',
Expand All @@ -35,15 +35,15 @@ mod 'corosync',
:git => 'https://github.com/puppetlabs/puppetlabs-corosync.git'

mod 'firewall',
:commit => '667a9f67a7ce8eb343c132feb1e00c6e2132d38a',
:commit => 'cbfca920444c5da5bddd3990f89ca61e5bcc0006',
:git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'

mod 'galera',
:commit => '92463ad0567c066796b7fac4a1466e6a60621f6c',
:commit => '26016bc260b6d1101201dd1ca791deb1a5fcf2cf',
:git => 'https://github.com/redhat-openstack/puppet-galera.git'

mod 'glance',
:commit => '0db42a6a60bd4952f795d61ea26ed299e8c35bc8',
:commit => 'c76d39605ff311eaba6ca226ac7dac19f86279ed',
:git => 'https://github.com/stackforge/puppet-glance.git'

mod 'gluster',
Expand All @@ -55,59 +55,59 @@ mod 'gnocchi',
:git => 'https://github.com/stackforge/puppet-gnocchi.git'

mod 'haproxy',
:commit => 'd89fad1c32cba514298c7eb2b82705a997f472f4',
:commit => '3007560fc47da48d576890b1823e0ccfac3d9207',
:git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'

mod 'heat',
:commit => 'a974b0651c852fb693919b92bf3da648b41a156b',
:commit => '01004884a1a4d3e2e5fac779975ddc18fec034cd',
:git => 'https://github.com/stackforge/puppet-heat.git'

mod 'horizon',
:commit => '3e2776bcef02ed062ab7df76d99e8852eec83b91',
:commit => 'b975b22d97f5b794160bfdd5c4190990e8496331',
:git => 'https://github.com/stackforge/puppet-horizon.git'

mod 'inifile',
:commit => '3bfcceb17f35f53f58a1f018a388b74178c661f3',
:commit => 'c72bfbb9b1df49ec66a4899e84ea869a1c18426c',
:git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'

mod 'ipa',
:commit => '4e634b31633bc956341e20980233107a6d5dc1f9',
:git => 'https://github.com/xbezdick/puppet-ipa-1.git'

mod 'ironic',
:commit => '0c859d8fc9a2fc790f20013e8668f520e01ef3a2',
:commit => '78e0dc117ee77275f40dcda8dd060f1d6ca06499',
:git => 'https://github.com/stackforge/puppet-ironic.git'

mod 'keepalived',
:commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
:git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'

mod 'keystone',
:commit => 'edf8c3e1753b5ad0eaf982f5932ce61c55a987bd',
:commit => 'eb240c5aa120d428567fb7c239167def96b6b75f',
:git => 'https://github.com/stackforge/puppet-keystone.git'

mod 'manila',
:commit => '8c8b02b6f294a68544df96180b4c2dcfe3bdddf0',
:commit => 'ce1fa24cfdbb1073a1fedbb373b690b92b35c43f',
:git => 'https://github.com/stackforge/puppet-manila.git'

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

mod 'module-collectd',
:commit => '6a9f9492af6a3a59b74f043ce6bb8227909224b2',
:commit => '27c81f69d00722ce7a6ac1e9c13b8e76fc7a5204',
:git => 'https://github.com/pdxcat/puppet-module-collectd.git'

mod 'module-data',
:commit => '0eead7f411f404b0a9a73bb161aac46c9fbe3219',
:git => 'https://github.com/ripienaar/puppet-module-data.git'

mod 'mongodb',
:commit => 'bc6cec0bfa3b69c5892302789cf39195a1549369',
:commit => '14117ae3391862021555df8139c66fd04c13c0c3',
:git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'

mod 'mysql',
:commit => '030556162ef1b2a06629dad318fdb89925f737ea',
:commit => '5f76233b7f44bb5d11521d78e60f0545da19e60e',
:git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'

mod 'n1k_vsm',
Expand All @@ -119,27 +119,27 @@ mod 'nagios',
:git => 'https://github.com/gildub/puppet-nagios-openstack.git'

mod 'neutron',
:commit => 'b29ee6f706bf7371f69b831f99727396ddb77cad',
:commit => 'dea7f4719fea5529d916ef4cae56020e8ee4efea',
:git => 'https://github.com/stackforge/puppet-neutron.git'

mod 'nova',
:commit => '3cba5197cc5c4e7807d5c97d374fb175b47878c7',
:commit => 'f4330488dd503562ba936c2f14d23e6af3ee9fca',
:git => 'https://github.com/stackforge/puppet-nova.git'

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

mod 'ntp',
:commit => '53570725fa40ae5bd7368cbaf47b549966d030f2',
:commit => 'c0613256dfcec3fb0ec20ef42c9d9e47f0412648',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp'

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

mod 'openstacklib',
:commit => '54f3a0be5c6a7893d179206e99ed0cd47a0d9d86',
:commit => 'd0de990f92a9a9cb7f705ecd39dd8aa02d02bf48',
:git => 'https://github.com/stackforge/puppet-openstacklib.git'

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

mod 'rabbitmq',
:commit => '5d71d50aadfa423b69fe2dfe6171a8ba25d8c0b2',
:commit => 'd3c6971a3e97b7079a6076a43a8891000757797b',
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'

mod 'redis',
:commit => '20baca47f04586a2089bdcf64db1d6c7bfe014ec',
:commit => 'aa13ac935693204972b7255233f13402634f256e',
:git => 'https://github.com/arioch/puppet-redis.git'

mod 'remote',
Expand All @@ -171,7 +171,7 @@ mod 'rsync',
:git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'

mod 'sahara',
:commit => '704d1d812e89b88a49a8d3cf8f9502f47267b256',
:commit => '326860e6244927474f458e5df220abcb59049576',
:git => 'https://github.com/stackforge/puppet-sahara.git'

mod 'snmp',
Expand All @@ -187,19 +187,19 @@ mod 'staging',
:git => 'https://github.com/nanliu/puppet-staging.git'

mod 'stdlib',
:commit => '35c77c7a7a3e9620b79833ba95ed0618bdc9492f',
:commit => '4a8c0a57f2c4df4e2e3fa37466f02a7f6fccd517',
:git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'

mod 'swift',
:commit => '08f61073119f25033bf1bdc7e7c18cade837cc0c',
:commit => 'ef9f9a4194237b3cd00446f42d1b407d203cbfd5',
:git => 'https://github.com/stackforge/puppet-swift.git'

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

mod 'tempest',
:commit => 'b3d764809c1e20e4f20022c518b662ebe7d6b663',
:commit => 'd46a0c403ee9adcdc2a694c609d9bb6fe3b5a05f',
:git => 'https://github.com/stackforge/puppet-tempest.git'

mod 'timezone',
Expand All @@ -211,26 +211,26 @@ mod 'tripleo',
:git => 'https://github.com/stackforge/puppet-tripleo.git'

mod 'trove',
:commit => '19731ad8f1598106226617b7bd66a1ee1fd67ac2',
:commit => '16e82e68ea62efec3ec7e11d7b9887e16b773372',
:git => 'https://github.com/stackforge/puppet-trove'

mod 'tuskar',
:commit => '8c28b3a40f2dba6f70dfa1cad13f2709173bc213',
:git => 'https://github.com/stackforge/puppet-tuskar.git'

mod 'vcsrepo',
:commit => '4cc3383f3e22edb31a03a3dad7817734529781ee',
:commit => '18b91b2f51a1cd8cd6911bd981e4629dd0d407e8',
:git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'

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

mod 'vswitch',
:commit => '58e807a42cf62890405c51d85a0f84b196faed60',
:commit => '8bdf36261b7f25ac0f0af84804d102db0ba51007',
:git => 'https://github.com/stackforge/puppet-vswitch.git'

mod 'xinetd',
:commit => '902825112b383dc837acfdd326457f5ba2c5921b',
:commit => '1420bf2bf2462a95185e9d2fffdf0a93edd8c7dc',
:git => 'https://github.com/puppetlabs/puppetlabs-xinetd.git'

5 changes: 5 additions & 0 deletions apache/.travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@ matrix:
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
allow_failures:
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
notifications:
email: false
42 changes: 36 additions & 6 deletions apache/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Specifies the location where apache module files are stored. It should not be co

#####`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.
Sets the file name for the module loadfile. Should be in the format \*.load. This can be used to set the module load order.

#####`log_level`

Expand All @@ -371,6 +371,17 @@ Define additional [LogFormats](https://httpd.apache.org/docs/current/mod/mod_log
$log_formats = { vhost_common => '%v %h %l %u %t \"%r\" %>s %b' }
```

There are a number of predefined LogFormats in the httpd.conf that Puppet writes out:

```httpd
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%h %l %u %t \"%r\" %>s %b" common
LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent
```

If your `$log_formats` contains one of those, they will be overwritten with **your** definition.

#####`logroot`

Changes the directory where Apache log files for the virtual host are placed. Defaults to '/var/log/httpd' on RedHat, '/var/log/apache2' on Debian, '/var/log/apache22' on FreeBSD, and '/var/log/apache2' on Gentoo.
Expand Down Expand Up @@ -549,6 +560,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
* `auth_basic`
* `auth_cas`* (see [`apache::mod::auth_cas`](#class-apachemodauthcas) below)
* `auth_kerb`
* `authn_core`
* `authn_file`
* `authnz_ldap`*
* `authz_default`
Expand Down Expand Up @@ -1365,11 +1377,11 @@ Sets [PassengerPreStart](https://www.phusionpassenger.com/documentation/Users%20

#####`php_flags & values`

Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '[]'.
Allows per-vhost setting [`php_value`s or `php_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values can be overwritten by a user or an application. Defaults to '{}'.

#####`php_admin_flags & values`

Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '[]'.
Allows per-vhost setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user or an application. Defaults to '{}'.

#####`port`

Expand Down Expand Up @@ -1932,9 +1944,10 @@ Allows configuration settings for [directory indexing](http://httpd.apache.org/d
apache::vhost { 'sample.example.net':
docroot => '/path/to/directory',
directories => [
{ path => '/path/to/directory',
options => ['Indexes','FollowSymLinks','MultiViews'],
index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
{ path => '/path/to/directory',
directoryindex => 'disabled', # this is needed on Apache 2.4 or mod_autoindex doesn't work
options => ['Indexes','FollowSymLinks','MultiViews'],
index_options => ['IgnoreCase', 'FancyIndexing', 'FoldersFirst', 'NameWidth=*', 'DescriptionWidth=*', 'SuppressHTMLPreamble'],
},
],
}
Expand All @@ -1956,6 +1969,23 @@ Sets the [default ordering](http://httpd.apache.org/docs/current/mod/mod_autoind
}
```

######`index_style_sheet`

Sets the [IndexStyleSheet](http://httpd.apache.org/docs/current/mod/mod_autoindex.html#indexstylesheet) which adds a CSS stylesheet to the directory index.

```puppet
apache::vhost { 'sample.example.net':
docroot => '/path/to/directory',
directories => [
{ path => '/path/to/directory',
options => ['Indexes','FollowSymLinks','MultiViews'],
index_options => ['FancyIndexing'],
index_style_sheet => '/styles/style.css',
},
],
}
```

######`options`

Lists the [Options](http://httpd.apache.org/docs/current/mod/core.html#options) for the given Directory block.
Expand Down
15 changes: 7 additions & 8 deletions apache/manifests/default_mods.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
::apache::mod { 'log_config': }
::apache::mod { 'unixd': }
}
'Suse': {
::apache::mod { 'log_config': }
}
default: {}
}
case $::osfamily {
Expand All @@ -34,13 +37,12 @@
if $all {
case $::osfamily {
'debian': {
include ::apache::mod::authn_core
include ::apache::mod::reqtimeout
if versioncmp($apache_version, '2.4') >= 0 {
::apache::mod { 'authn_core': }
}
}
'redhat': {
include ::apache::mod::actions
include ::apache::mod::authn_core
include ::apache::mod::cache
include ::apache::mod::mime
include ::apache::mod::mime_magic
Expand All @@ -61,16 +63,14 @@
::apache::mod { 'substitute': }
::apache::mod { 'usertrack': }

if versioncmp($apache_version, '2.4') >= 0 {
::apache::mod { 'authn_core': }
}
else {
if versioncmp($apache_version, '2.4') < 0 {
::apache::mod { 'authn_alias': }
::apache::mod { 'authn_default': }
}
}
'freebsd': {
include ::apache::mod::actions
include ::apache::mod::authn_core
include ::apache::mod::cache
include ::apache::mod::disk_cache
include ::apache::mod::headers
Expand All @@ -88,7 +88,6 @@
::apache::mod { 'auth_digest': }
::apache::mod { 'auth_form': }
::apache::mod { 'authn_anon': }
::apache::mod { 'authn_core': }
::apache::mod { 'authn_dbm': }
::apache::mod { 'authn_socache': }
::apache::mod { 'authz_dbd': }
Expand Down
6 changes: 6 additions & 0 deletions apache/manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,12 @@
require => Package['httpd'],
}
}
'Suse': {
$pidfile = '/var/run/httpd2.pid'
$error_log = 'error.log'
$scriptalias = '/usr/lib/cgi-bin'
$access_log_file = 'access.log'
}
default: {
fail("Unsupported osfamily ${::osfamily}")
}
Expand Down
Loading

0 comments on commit 41eeefb

Please sign in to comment.