Bump modules to their latest masters

Update apache to 346c0e7 346c0e7 Merge pull request #1152 from aronymous/feature/master/passengerbaseuri 84bb0fe Merge pull request #1200 from edmundcraske/fix-freebsd-mpm_prefork 3e1f0c5 Merge pull request #1183 from traylenator/kerb bf948c0 (MODULES-2419) - Add mod_auth_kerb parameters to vhost. 49fed02 Fix typo of MPM_PREFORK 9367580 (MODULES-2188) Add support for PassengerBaseURI in Apache This adds a varaible and template block for using PassengerBaseURI in the vhost Change-Id: I2bb5ab53e088099936427e086bfefb74c6bd8c08 Update ceilometer to 67aa7266e75de57daaa88f1d8b2a6b887c64dfc6 67aa7266e75de57daaa88f1d8b2a6b887c64dfc6 Merge "Creation of ceilometer::db::sync" 93f2f4a2227fc6a138d2c9e9494d44ab626c4840 Merge "acceptance/eventlet: make sure apache is stopped" 2d6f830e136d9e08a2daf9ec110668a869423715 Merge "Disable lint warning check" 7c549514a702a597e2dce944cd146416d176e312 acceptance: bump to Liberty a4a12b2612c1e54579c79fa6faef91b684b9aff1 Disable lint warning check 0fb6851f5fc8a306dc2b850d7336591833f8ad1d acceptance/eventlet: make sure apache is stopped 7b920066e1aeb7f4201bb74ecf4c31f1efb9cafe Creation of ceilometer::db::sync Change-Id: Ic092d1785181d82408a28eb0cebb2b41d87a1243 Update cinder to 3259caa0efe369f4dfe6dd69791cfade2326e435 3259caa0efe369f4dfe6dd69791cfade2326e435 Move default value to '<SERVICE DEFAULT>' c5d73e1bc73dfd6354e1bb7bb49207a553af4cf5 Merge "acceptance: switch RDO to CBS repositories" d9de56f4a7df23c7551a7feff8f5baae9b200c7d acceptance: switch RDO to CBS repositories Change-Id: I52fef8934d0534d6ceaccd7be13a765dbe0de735 Update glance to 03e1e00cbd2f33f937a1a2919e3c444f67fa0731 03e1e00cbd2f33f937a1a2919e3c444f67fa0731 Merge "Initial msync run for all Puppet OpenStack modules" 2993b223bb75f44734b34a58fca87a052a511e9e Merge "Require at least 4.2.0 of stdlib" 7147ba03233c110f3e7302aaa5d80fc1213ade8b glance_image: hardcode os-image-api-version to 1 de99b85614df9bbbe19214a21b584620cba43631 Require at least 4.2.0 of stdlib ed1425897f6e02871e0682347e2de01c84e24bf4 Merge "Update CHANGELOG.md and other files" 1a6a0b916265d5c5e71d749d65f0adc4ca868b85 Merge "Creation of glance::db::sync" a5cee560b4dc10f0a9732d27898d3659f245232b Merge "acceptance: switch RDO to CBS repositories" ef5652f1f8d11f9bbbce18106e08f284ea35415d acceptance: switch RDO to CBS repositories 0860b66fdc88c5a169e0e3886960a7e15f665c48 Fix rspec 3.x syntax 48a7164021c8e4e85e5f6409896c45ee25f42218 Creation of glance::db::sync 6ea3194989334a9d479e6e4eacb174161bdf9800 Initial msync run for all Puppet OpenStack modules 9989505da6a8eff4c606fc191de01f6d672e9046 Update CHANGELOG.md and other files Change-Id: I909cbf8adbb169aa12d092274100e7b43a2cf244 Update gluster to bf8bc52e6d67cea37864f22a2dd091ae988dcaa4 bf8bc52e6d67cea37864f22a2dd091ae988dcaa4 Fix: warning: found = in conditional, should be == Change-Id: I1e78602e75027f792de8a93654e039a9fb7baf25 Update heat to f5193ad715a3a06b00ae0894292d46af19bcfb0e f5193ad715a3a06b00ae0894292d46af19bcfb0e acceptance: switch RDO to CBS repositories Change-Id: I36db987dcef283e27c4aa7c5a5c8ba9757e4abee Update horizon to 4ff00b34e3af7f6608472ef0f5787e659c4fca6c 4ff00b34e3af7f6608472ef0f5787e659c4fca6c Merge "Remove duplicate key for ':servername'" 81ed5a9d459f02f4666f70f99a38e16d1f34112e Merge "Add ssl_no_verify parameter" f749bed0d161ff2a92fde5880c14f83ecbb53f7b Merge "remove hardcoded 'neutron_options' list" 787255deab5e37b88ac24d04c83b32dfea43e4f7 Merge "remove hardcoded 'cinder_options' list" ea35f59c3e1ea35500a243662f68c2c5a338ece0 Merge "remove hardcoded 'hypervisor_options' list" 58f2cfe9560a7ed4c99d47fb32814a2b402238c8 remove hardcoded 'neutron_options' list 8c5b7da3922cf23c6d26ec12626da96600124b4c remove hardcoded 'cinder_options' list ec5e9963d87cd4e6fa8aa9fda9140c400da6fc5b remove hardcoded 'hypervisor_options' list 165408856f33447a7b84d030f07655140ab575d2 acceptance: bump to Liberty 7ff4f745bcf29c47323fcc6250d5f36fb7a8b57b Remove duplicate key for ':servername' 400bc877b82f796bc058ab4d9341e0071e7e410b Add ssl_no_verify parameter Change-Id: I8c53e8f606ade777184ea8bb36c671e88abe5cdc Update ironic to 557afd41e14671f409215261ccc879818c952a4c 557afd41e14671f409215261ccc879818c952a4c Merge "acceptance: bump to Liberty" 163509c05405b6d18292824beab241b70e11cc2d acceptance: bump to Liberty 883f4872202c9719d15075954b615375cc06cd18 Fix rspec 3.x syntax Change-Id: I5e0de315244e8377efeb3a344e7e57431cc4019f Update keystone to 40a1d04410e0cc2bdfd1a8fa2ccca70eb202993f 40a1d04410e0cc2bdfd1a8fa2ccca70eb202993f Merge "Add additional memcache configuration options" ca663adcd6222a4a598a9639a839d524972d9a62 Merge "Fix spelling in deprecation message" 877fd505b767d1b74bd5afcbc0c178b53e299c96 Fix spelling in deprecation message 9f8ea7d7b4ad33b629b6991837ade04021927280 Endpoints can be APIs version-less 6d8239183b73c568d662b9fe21cfedf8de2ddaae Merge "Fix *_workers config settings." 1b6308a94de9bbc7e7fcad03a6b4a582ab37fdd9 Merge "Fixes get_section for future use" d5358c65114cf6ed3baf6eeef4c27a76ee916b64 Merge "acceptance: switch RDO to CBS repositories" ec84ac9c958a44c15d3511a31effc423c8d61470 Fix *_workers config settings. 60bf2b048c1054871567173688945857d6c3caf9 Fixes get_section for future use 59a76f7317e90e6268b9270f2738b61d13ae51e2 Merge "Use Ubuntu provided wsgi.py for keystone.wsgi" dd4ea76d233265294e368efb0634be43187d2af4 acceptance: switch RDO to CBS repositories 89aafb88f52cd305eb4bf80b4adee8ce6594744f able to use wrong resource name f7c8fc2ffa15272548623c1f58be0e007e5a16be able to use wrong value for default_domain_id 74f01da92f8de2fcb471ec5f9833ead1bff2dee1 domain name from id lookups return empty 6ee894a287d1c5c31ebb5f79beee396c7e9d7ee6 Use Ubuntu provided wsgi.py for keystone.wsgi 8501640071cad234fad9e25acc216bfb15b69ddf Add additional memcache configuration options Change-Id: I1b7f15acdbcd52b0639e67888c7e934c906ccc2b Update manila to 87ed677909ecdae78a3459b13118117c740b127e 87ed677909ecdae78a3459b13118117c740b127e Merge "acceptance: switch RDO to CBS repositories" 395d1ff344da6557f0d19181808695ac53db37a7 acceptance: switch RDO to CBS repositories 5ac17ab421e667605e2f645ad9d18c160bd46030 Fix rspec 3.x syntax Change-Id: I9e624dce69073a8ccd359d3d7a1ab6ffa25da3c1 Update module-collectd to 07378b476f892648c3ef9cac6f1b0ed481917b17 07378b476f892648c3ef9cac6f1b0ed481917b17 Merge pull request #338 from shanemadden/snmp-typo-fix 650b3f13a8b2155d667003fde23d86892f91befa Typo fix s/Shitf/Shift/ 30186b77fce8dd7b51b1d3ce450869079c2794f0 Merge pull request #335 from waldosCH/feature/addPluginWriteSensu cf338774748f8e0afac52d2fa9d12ff11206fd66 Added documentation for write_sensu plugin. b98a29ea9cec1482d4c090aec2e97e6ecd34fa07 Added new class to manage the plugin write_sensu and the corresponding config template Change-Id: Ic5b8ac8fabed9a4c85c705b87fd69522bc8c639d Update neutron to 3f8d040caa7143f4c117a889c464ba36db58d39e 3f8d040caa7143f4c117a889c464ba36db58d39e Merge "Remove use of template based config from cisco ml2 nexus plugin." 6dc74ac0e69d4bdd4da826189b6d6c2d2bc8e6a9 Remove use of template based config from cisco ml2 nexus plugin. 424ea9a34dcb2cd306b17fae19174ed98fe911a3 Merge "acceptance: switch RDO to CBS repositories" 11d0da39486f936ba563dd0c7661289eb709299b Merge "Make vswitch optional for ovs agent configuration" 67a67fdcc60773f3c78e4631069370c0c282f60b Merge "Configure Big Switch ML2 plugin" ea29622cba7ed999e8c688cbc81817f0ca4a8ed8 acceptance: switch RDO to CBS repositories 8738c8f41480403f17f6f68472787523c62d76a3 Fix rspec 3.x syntax c1b2cf360787a8171632eb0baa19b09d44983822 Make vswitch optional for ovs agent configuration f8ec8a20a0137ac15d7a6303d46fd9c8f3fbd9d7 Configure Big Switch ML2 plugin Change-Id: I7d3ac426d68a5238a0e82d8e74e6199d6f5408fb Update nova to 21029f04f733de72d69bac3d729f68baf9038c74 21029f04f733de72d69bac3d729f68baf9038c74 Merge "Use auth_nova method to create nova network" 0d14fc1208b2ff8b5461609af628eab4b3026086 Merge "docfix: update default image_service param in doc" 4ae687669270eaf8cd81376f26e42cded1db80e3 Merge "add config_drive_format option to nova_compute" 67550c266aad9c20389fd4f4ae6b685e9c771735 acceptance: switch RDO to CBS repositories 712efc3093b109b2fa48b02bfbbf4526359c8561 add config_drive_format option to nova_compute f84dc0205ffebca326234e13a0f33e279dc6ba91 docfix: update default image_service param in doc fc2480588736ed5168e829bf81270dfc7965a77e Use auth_nova method to create nova network Change-Id: I1968d031b4fba79d8f18fa4a1ae620d81c7222a3 Update openstack_extras to e005145df14538c04e07d213b43be50ca2551e8b e005145df14538c04e07d213b43be50ca2551e8b Fix RSpec 3.x syntax Change-Id: I89c7ed7bf74feda725e93d30458811738f71ef6c Update rabbitmq to 1e2ea5c 1e2ea5c Merge pull request #386 from dgmorales/add-stomp-ssl-only 172c659 Add parameter to configure only the SSL port for STOMP plugin Change-Id: I2d2b342a22016690cd0dc2a595243cc9372bea46 Update sahara to 1b1e9fb9d4085200495ad09ff978f7b941d48817 1b1e9fb9d4085200495ad09ff978f7b941d48817 Merge "Add new parameter 'plugins' for Sahara" 405cf2e0683ab671c63828e43733d9eb7a8866ec Merge "Revert "Fixed /etc/sahara handling"" a49a45a285b015f1315adab27624e77ae0fe0916 Add new parameter 'plugins' for Sahara 4a214b5bce5a1d4d13a72cfb532bdf45d7909a58 Revert "Fixed /etc/sahara handling" 8a2efc58b882f4ab913aa3b1613361e024bfe999 Introduce sahara::db class 98478e76b3e98a02dc632fa16cb25c4146b25dc1 Merge "acceptance: switch RDO to CBS repositories" ac863e9faf1f2c31ba27085d97cabad9d5536221 acceptance: switch RDO to CBS repositories Change-Id: Ibe0e63b67f54391b4661805f9bea6aae93e0afb0 Update stdlib to 9b1932c 9b1932c Merge pull request #526 from DavidS/improve-validate_re-docs 55ece78 (MAINT) validate_re: Clarify docs and error message 399ce03 Merge pull request #524 from binford2k/docs/intersection_truthiness 169f8af Clarify what an empty intersection looks like. 0ea0e40 Merge pull request #523 from DavidS/modules-2516-is_a c0df819 Merge pull request #511 from dmitryilyin/parseyaml_default 00c881d (MODULES-2516) Adds an is_a() function eb948c4 [MODULES-2462] Improve parseyaml function Change-Id: Iffe6321a9d4ef87156ba3f52c66c79778000958f Update swift to 96b4f5c7c5c5fd10c0ddee41962531aa5021d906 96b4f5c7c5c5fd10c0ddee41962531aa5021d906 Merge "Config resources applied after config template" 6fe1ec4ad6855022c6bc9b0ea85a1ef825b23888 acceptance: switch RDO to CBS repositories 86851f4a2fab105ec99608ea0bcd024d5c14474b Fix rspec 3.x syntax 56512264bfb43f6671b49a4e07a1930012a1914d Config resources applied after config template Change-Id: If873bd01988984e6d4248ff3cf9039a9e1ad22bb Update tripleo to 7ca1bbf046abfd0cc5897fba49683c62e2c33dbe 7ca1bbf046abfd0cc5897fba49683c62e2c33dbe Merge "Allow a user to specify the syslog address for HAProxy" ff6f4864e6f999faff75e8c720f789a3876c938c loadbalancer: use http mode for Horizon haproxy config 55b77339542a30b3137a5b9ce23ca960eb911e9a Merge "Initial msync run for all Puppet OpenStack modules" 14ac699d8ab97dda03b8711f1a8ac26f6fd52191 Allow a user to specify the syslog address for HAProxy f4872ac98adf09a0888deba5089f5acdea5ec726 Merge "Add package_manifest resource." ad974333e0df16cca7aa2f144c84b11dca1d70fc loadbalancer: use 'source' for novnc balance mode e3abcd6b5330959016b43115a8bf1b1cef668d30 Add package_manifest resource. e879bb607009ecf7f7d48e5210409408e5a17f44 Initial msync run for all Puppet OpenStack modules Change-Id: I311c6bb070cb74cfce504ad4dac3e5d764df7150 Update trove to 2c907a77f9a8a76516f784fbf3a2bca213876e4c 2c907a77f9a8a76516f784fbf3a2bca213876e4c Merge "Fix rspec 3.x syntax" 61d3378cb51f4b4b4175058b5c1bd93a55f0a51d Merge "Initial msync run for all Puppet OpenStack modules" 340f2c0fef0079b7a1091287093cc11dee15a729 Fix rspec 3.x syntax ea102af2ecb9ff594231b220fb0a8eee739b0cbd acceptance: switch RDO to CBS repositories 7145694b744be5008d2f805886d6e7416b646051 Initial msync run for all Puppet OpenStack modules Change-Id: I5c879069f03278540bd810fdc52407df9c8c3b48 Update vcsrepo to 279be07607dd132f9446291cf1afa5ef2320632a 279be07607dd132f9446291cf1afa5ef2320632a Merge pull request redhat-openstack#262 from webfactory/autorequire-hg 276af8b8e7633df9e2debb07a359195b970f71b0 Merge pull request redhat-openstack#272 from tphoney/dos2unix_readme 9a9f343e8358c05766a2899c0e9037fd98df4595 dos2unix the readme f0d087a1cbf99228b9edb3e1d2e28d81df794e24 Merge pull request redhat-openstack#269 from monai/develop 7758331f503a9198921362761079cbfd941c625e Add feature depth and param trust_server_cert to svn 6b01539dfee074b798f7e96cb228a42ae6a42c8b Autorequire Package['mercurial'] Change-Id: Ia577794f9ce13d633a8d42e8511abfc2dbf0c135 Update vswitch to 934d053cb90624256df2a5468e9783d016e9f270 934d053cb90624256df2a5468e9783d016e9f270 Fix RSpec 3.x syntax Change-Id: I49d0553342d90aac98ce6d4978436f8711060115
xbezdick · Sep 21, 2015 · 55967fa · 55967fa
1 parent 3ab89f3
commit 55967fa
Show file tree

Hide file tree

Showing 180 changed files with 3,479 additions and 1,922 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -1,13 +1,13 @@
 mod 'apache',
-  :commit => 'ec5c0e57fe09b4dc64fef2ef16823ef9a11f2e75',
+  :commit => '346c0e7f50664ba23a656bc1dbeeda653dedb318',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
   :commit => '9a3b74b0dbb655a3afcbc8bdee442f2143420b72',
   :git => 'https://github.com/aimonb/puppet_aviator.git'
 
 mod 'ceilometer',
-  :commit => '7d20689bbb3857872cd63497ac45d523ed775d0d',
+  :commit => '67aa7266e75de57daaa88f1d8b2a6b887c64dfc6',
   :git => 'https://github.com/openstack/puppet-ceilometer.git'
 
 mod 'ceph',
@@ -19,7 +19,7 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => '2f6bd73ed9dd3f5c7371784ee311fd74ce74b37b',
+  :commit => '3259caa0efe369f4dfe6dd69791cfade2326e435',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -43,11 +43,11 @@ mod 'galera',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => 'bce0eac01c193f565e1b915c9002725800b9a069',
+  :commit => '03e1e00cbd2f33f937a1a2919e3c444f67fa0731',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
-  :commit => 'e3c2486867b950a892663b7eca03bceee84c8b6e',
+  :commit => 'bf8bc52e6d67cea37864f22a2dd091ae988dcaa4',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
@@ -59,11 +59,11 @@ mod 'haproxy',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '07e52b5ac9c08b0f51ea75e8ef3709b2fd9873fb',
+  :commit => 'f5193ad715a3a06b00ae0894292d46af19bcfb0e',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '2eaaebdf08e66096bb3da6d52a876fbe0d8dee0e',
+  :commit => '4ff00b34e3af7f6608472ef0f5787e659c4fca6c',
   :git => 'https://github.com/openstack/puppet-horizon.git'
 
 mod 'inifile',
@@ -75,27 +75,27 @@ mod 'ipa',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '7f09ae46c15fe5fd97e39b85e7cdb63a83283c37',
+  :commit => '557afd41e14671f409215261ccc879818c952a4c',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'keepalived',
   :commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => '3f722eda30781ac47693d4112fe61a76357b94f5',
+  :commit => '40a1d04410e0cc2bdfd1a8fa2ccca70eb202993f',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'manila',
-  :commit => 'c9c70763e3c7b7f2c68fc7da1fb12e7945b85e4c',
+  :commit => '87ed677909ecdae78a3459b13118117c740b127e',
   :git => 'https://github.com/openstack/puppet-manila.git'
 
 mod 'memcached',
   :commit => '8e6fdfda7400c40176baa5063e05ff716cc5fd73',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => 'f1d573f7ab7c1dbe5b6b827584747ffc85bf57ca',
+  :commit => '07378b476f892648c3ef9cac6f1b0ed481917b17',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',
@@ -119,11 +119,11 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => 'f247f3cd5e7fff8b578091aac431518e91745342',
+  :commit => '3f8d040caa7143f4c117a889c464ba36db58d39e',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '6dd1d00e4094ff1fbe61bdacb33e5f1176b65905',
+  :commit => '21029f04f733de72d69bac3d729f68baf9038c74',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',
@@ -135,7 +135,7 @@ mod 'ntp',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
-  :commit => '13f29975a6605f505f97881d1c84a3b2aa8e5514',
+  :commit => 'e005145df14538c04e07d213b43be50ca2551e8b',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',
@@ -155,7 +155,7 @@ mod 'qpid',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => '42c5fd883c37647947cc69b10cf7ab5a8ca03fbe',
+  :commit => '1e2ea5cc4844722259173335f135709972fe6dcd',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',
@@ -171,7 +171,7 @@ mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
-  :commit => '9d0826a38b306001a744f36fb2c226dce3130c9a',
+  :commit => '1b1e9fb9d4085200495ad09ff978f7b941d48817',
   :git => 'https://github.com/openstack/puppet-sahara.git'
 
 mod 'snmp',
@@ -187,11 +187,11 @@ mod 'staging',
   :git => 'https://github.com/nanliu/puppet-staging.git'
 
 mod 'stdlib',
-  :commit => '2a7a93ffb49b2ae63d4fd09982fd8c382c1f4b5a',
+  :commit => '9b1932c538354c1b360838c8cf7b942af314c99d',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => 'bbcccfa8014d3280bc1c909b6ab0e46eae12dc4e',
+  :commit => '96b4f5c7c5c5fd10c0ddee41962531aa5021d906',
   :git => 'https://github.com/openstack/puppet-swift.git'
 
 mod 'sysctl',
@@ -207,27 +207,27 @@ mod 'timezone',
   :git => 'https://github.com/saz/puppet-timezone.git'
 
 mod 'tripleo',
-  :commit => 'c529fce3ef2f246909cb821bc2319cc5413960d3',
+  :commit => '7ca1bbf046abfd0cc5897fba49683c62e2c33dbe',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '3c634e122f8b086ada3744c3188a1b02e0c480a0',
+  :commit => '2c907a77f9a8a76516f784fbf3a2bca213876e4c',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',
   :commit => 'b2875e2d673f4a595f3991eac44689b5f8e4c9c6',
   :git => 'https://github.com/openstack/puppet-tuskar.git'
 
 mod 'vcsrepo',
-  :commit => 'a39349a4388cd56aad5cfc8eead2f2a17f545287',
+  :commit => '279be07607dd132f9446291cf1afa5ef2320632a',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
 
 mod 'vlan',
   :commit => 'c937de75c28e63fba8d8738ad6a5f2ede517e53d',
   :git => 'https://github.com/derekhiggins/puppet-vlan.git'
 
 mod 'vswitch',
-  :commit => 'a0cc00d98e833dd905aaa291dd2bd1fa443d8455',
+  :commit => '934d053cb90624256df2a5468e9783d016e9f270',
   :git => 'https://github.com/openstack/puppet-vswitch.git'
 
 mod 'xinetd',

diff --git a/apache/README.md b/apache/README.md
@@ -1964,6 +1964,51 @@ Usage typically looks like:
     }
 ~~~
 
+##### `auth_kerb`
+
+Enable mod_auth_kerb parameters for a virtual host. Valid values are 'true' or 'false'. Defaults to 'false'.
+
+Usage typically looks like:
+
+~~~ puppet
+    apache::vhost {'sample.example.net':
+      auth_kerb              => true,
+      krb_method_negotiate   => 'on',
+      krb_auth_realms        => ['EXAMPLE.ORG'],
+      krb_local_user_mapping => 'on',
+      directories            => { 
+        path         => '/var/www/html',
+        auth_name    => 'Kerberos Login',
+        auth_type    => 'Kerberos',
+        auth_require => 'valid-user',
+      }
+    }
+~~~
+
+##### `krb_method_negotiate`
+
+To enable or disable the use of the Negotiate method. Defaults is 'on'
+
+##### `krb_method_k5passwd`
+
+To enable or disable the use of password based authentication for Kerberos v5. Default is 'on'
+
+##### `krb_authoritative`
+
+If set to off this directive allow authentication controls to be pass on to another modules.  Default is 'on'
+
+##### `krb_auth_realms`
+
+Specifies an array Kerberos realm(s) to be used for authentication. Default is []
+
+##### `krb_5keytab`
+
+Location of the Kerberos V5 keytab file. Not set by default.
+
+##### `krb_local_user_mapping`
+
+Strips @REALM from username for further use. Not set by default.
+
 ##### `logroot`
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
@@ -2140,6 +2185,10 @@ This directive is equivalent to proxy_pass, but takes regular expressions, see [
 
 Specifies the resource identifiers for a rack configuration. The file paths specified are listed as rack application roots for [Phusion Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#_railsbaseuri_and_rackbaseuri) in the _rack.erb template. Defaults to 'undef'.
 
+#####`passenger_base_uris`
+
+Used to specify that the given URI is a Phusion Passenger-served application. The file paths specified are listed as passenger application roots for [Phusion Passenger](https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html#PassengerBaseURI) in the _passenger_base_uris.erb template. Defaults to 'undef'.
+
 ##### `redirect_dest`
 
 Specifies the address to redirect to. Defaults to 'undef'.

diff --git a/apache/manifests/package.pp b/apache/manifests/package.pp
@@ -17,11 +17,11 @@
         }
         'worker': {
           $set = 'MPM_WORKER'
-          $unset = 'MPM_PERFORK MPM_EVENT'
+          $unset = 'MPM_PREFORK MPM_EVENT'
         }
         'event': {
           $set = 'MPM_EVENT'
-          $unset = 'MPM_PERFORK MPM_WORKER'
+          $unset = 'MPM_PREFORK MPM_WORKER'
         }
         'itk': {
           $set = undef

diff --git a/apache/manifests/vhost.pp b/apache/manifests/vhost.pp
@@ -81,6 +81,7 @@
   $redirectmatch_regexp        = undef,
   $redirectmatch_dest          = undef,
   $rack_base_uris              = undef,
+  $passenger_base_uris         = undef,
   $headers                     = undef,
   $request_headers             = undef,
   $filters                     = undef,
@@ -123,6 +124,13 @@
   $modsec_disable_ids          = undef,
   $modsec_disable_ips          = undef,
   $modsec_body_limit           = undef,
+  $auth_kerb                   = false,
+  $krb_method_negotiate        = 'on',
+  $krb_method_k5passwd         = 'on',
+  $krb_authoritative           = 'on',
+  $krb_auth_realms             = [],
+  $krb_5keytab                 = undef,
+  $krb_local_user_mapping      = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -213,6 +221,7 @@
     validate_re($allow_encoded_slashes, '(^on$|^off$|^nodecode$)', "${allow_encoded_slashes} is not permitted for allow_encoded_slashes. Allowed values are 'on', 'off' or 'nodecode'.")
   }
 
+  validate_bool($auth_kerb)
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -221,6 +230,10 @@
     include ::apache::mod::mime
   }
 
+  if $auth_kerb and $ensure == 'present' {
+    include ::apache::mod::auth_kerb
+  }
+
   if $virtual_docroot {
     include ::apache::mod::vhost_alias
   }
@@ -387,6 +400,11 @@
     }
   }
 
+  # Load mod_passenger if needed and not yet loaded
+  if $passenger_base_uris {
+      include ::apache::mod::passenger
+  }
+
   # Load mod_fastci if needed and not yet loaded
   if $fastcgi_server and $fastcgi_socket {
     if ! defined(Class['apache::mod::fastcgi']) {
@@ -656,6 +674,16 @@
     }
   }
 
+  # Template uses:
+  # - $passenger_base_uris
+  if $passenger_base_uris {
+    concat::fragment { "${name}-passenger_uris":
+      target  => "${priority_real}${filename}.conf",
+      order   => 155,
+      content => template('apache/vhost/_passenger_base_uris.erb'),
+    }
+  }
+
   # Template uses:
   # - $redirect_source
   # - $redirect_dest
@@ -751,6 +779,22 @@
     }
   }
 
+  # Template uses:
+  # - $auth_kerb
+  # - $krb_method_negotiate
+  # - $krb_method_k5passwd
+  # - $krb_authoritative
+  # - $krb_auth_realms
+  # - $krb_5keytab 
+  # - $krb_local_user_mapping
+  if $auth_kerb {
+    concat::fragment { "${name}-auth_kerb":
+      target  => "${priority_real}${filename}.conf",
+      order   => 210,
+      content => template('apache/vhost/_auth_kerb.erb'),
+    }
+  }
+
   # Template uses:
   # - $suphp_engine
   # - $suphp_addhandler

diff --git a/apache/spec/defines/vhost_spec.rb b/apache/spec/defines/vhost_spec.rb
@@ -252,6 +252,7 @@
           'redirectmatch_regexp'        => ['\.git$'],
           'redirectmatch_dest'          => ['http://www.example.com'],
           'rack_base_uris'              => ['/rackapp1'],
+          'passenger_base_uris'         => ['/passengerapp1'],
           'headers'                     => 'Set X-Robots-Tag "noindex, noarchive, nosnippet"',
           'request_headers'             => ['append MirrorID "mirror 12"'],
           'rewrites'                    => [
@@ -313,6 +314,13 @@
           'passenger_start_timeout'     => '600',
           'passenger_pre_start'         => 'http://localhost/myapp',
           'add_default_charset'         => 'UTF-8',
+          'auth_kerb'                   => true,
+          'krb_method_negotiate'        => 'off',
+          'krb_method_k5passwd'         => 'off',
+          'krb_authoritative'           => 'off',
+          'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
+          'krb_5keytab'                 => '/tmp/keytab5',
+          'krb_local_user_mapping'      => 'off',
         }
       end
       let :facts do
@@ -432,6 +440,16 @@
       it { is_expected.to contain_concat__fragment('rspec.example.com-passenger') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-charsets') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbMethodNegotiate\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbAuthoritative\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbAuthRealms\sEXAMPLE.ORG\sEXAMPLE.NET$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
+        :content => /^\s+KrbLocalUserMapping\soff$/)}
     end
     context 'set only aliases' do
       let :params do