Bump modules to latest masters

Update apache to 4037a84 4037a84 Merge pull request #1211 from jeffcoat/master 1518b08 Merge pull request #1210 from jlambert121/modsec_uploaddir e2b6bcf Correct typo in default_vhost => false example. 2730154 Merge pull request #1208 from traylenator/lrfs 7a67ab1 add SecUploadDir parameter to support file uploads with mod_security 13b0803 Merge pull request #1207 from snarlistic/MODULES-2613 10d632b (MODULES-2616) Optionally set LimitRequestFieldSize on an apache::vhost 9fd8ac4 Merge pull request #1205 from synyx/mod_authn_alias_in_debian_pre_2.4 99daf49 MODULES-2613 Small style cleanup to templates/vhost/_additional_includes.erb 2097596 Merge pull request #1206 from aduitsis/patch-1 2ab1046 Fix erroneous example in README.md 05613d7 also install mod_authn_alias as default mod in debian for apache < 2.4 Change-Id: I5535f97f16fee108e6b6c5145ec92ecb4e55fd72 Update ceilometer to 270e800e0d824a2741728d3ad28721b197cb1c6a 270e800e0d824a2741728d3ad28721b197cb1c6a Merge "Implement auth_endpoint_type parameter" 8ae5373336501a02163004b5c51bf8a2eae1e842 Merge "agent/auth: bring consistent how we manage empty parameters" 09b62c5f2a787609c24abe834ee06073a0c92805 Merge "rspec: run tests for ::ceilometer::agent::auth" ba9e8fe16ebc7b5b3700f139902c186f88c253b9 Merge "compute agent: do not try to configure nova.conf" 22723cce88a65a44afac3065ad800b4c0008f75d Implement auth_endpoint_type parameter 31879eeac45e8a24449cd09b085c6f856328ad1e agent/auth: bring consistent how we manage empty parameters aab80b7f93e033dae564fb6688440333a96dfc05 rspec: run tests for ::ceilometer::agent::auth 44fb7ff3b35d35727eb67314cd7fbca05ede16fa compute agent: do not try to configure nova.conf 392da101bb9212cc1ae9d5c64f923f14ac9a2b9c Bump RDO packages to tested repos 45f51aee3d5a86ccc93b4c4487ad405667970c4d Merge "Make 'alarm_history_time_to_live' parameter configurable" 2d669a5d6ed2a51f2f842e165ba50422c4d9954f Make 'alarm_history_time_to_live' parameter configurable Change-Id: I8d1ca61a2e71a958785ee21f89125616f5c90057 Update cinder to 8f3fa4c8227c9ed029fc7b6d3a8f672a49dfc264 8f3fa4c8227c9ed029fc7b6d3a8f672a49dfc264 Merge "Introduce cinder::db class" 15e72a64d49c3d7417eb18f404c3a46dd6c14eca Merge "Add support for Pure Volume Drivers" e980ccfb40d25ebd4762ed27374b8a4855bb49ec Add support for Pure Volume Drivers 9448cfa8454c36fac4c37b1ebb194e67fb0430f1 Introduce cinder::db class ef75b318e4f0a82720f38a07a5ff4d3fba2c6569 Merge "make it possible to have multiple type_sets with the same value" 03fe76b33581824d237c2ca724b3aa912e383cff Bump RDO packages to tested repos bdf24ea401ab718dd47b8c8cc9a1efd5d3fbc418 Make sure cinder is created before creating Cinder::Type e56e06b7f34efabaf8adfebcccbb76c08076b8ce make it possible to have multiple type_sets with the same value Change-Id: I9b1491501e5d890a7d6393118fc0341c7e510068 Update glance to e5f3e1358aec833398660b4194cfe074786b5f7c e5f3e1358aec833398660b4194cfe074786b5f7c Bump RDO packages to tested repos Change-Id: I8d84b95211907e17edb5162d2e3202ac95b923b2 Update heat to b608fcebda837ae4c9cdf2d8a8e6e3615f111cf5 b608fcebda837ae4c9cdf2d8a8e6e3615f111cf5 Update rpc_backend default parameter 1b209d35be143564d4592ef188ea5c0d906a8e96 Cleanup configure_delegated_roles deprecated parameter bfbcb914bd635112511325038820927e3081acbf Bump RDO packages to tested repos Change-Id: I6eefaa2e2e5a23e917a345383ce9c8a85eb4adac Update horizon to 34d3c0a79af9b1025466eae01ff9c6c042abed6c 34d3c0a79af9b1025466eae01ff9c6c042abed6c Merge "add new parameters for multidomain support" 29b04e88b1630b5631230d4a8648506856852923 Merge "add api_versions parameter" e5c0b082178353aab8c333483b54b7c6de8afe2f Bump RDO packages to tested repos 03d9c9576ee1b4155e2ece6b0786d92e969ef520 add new parameters for multidomain support 4ac9131f254c829319e2542ca26ef8fbc0d25323 add api_versions parameter Change-Id: I87fc682e822202ac2207d72f93949872e3a3e0d2 Update ironic to 9c976a61d0ac9c7bbf2521c89ea9a01f9c4a0d63 9c976a61d0ac9c7bbf2521c89ea9a01f9c4a0d63 Merge "Allow customization of db sync command line" 3f3388f13f7bd99702992549d333c447e3ef057d Merge "Add support for identity_uri." d3bfb42df7fa5a59d9870331be2e0ab12120b796 Bump RDO packages to tested repos b28cafe7183ddae7963f1436d5271bb8025c02f9 Allow customization of db sync command line 490699ff66e26d4291c3460813170d69fa1556f5 Add support for identity_uri. Change-Id: I1ea6887f673b458b8251d9f7814f11b43740b472 Update keystone to 240301fe01982b1c41839235d3dc19895f682108 240301fe01982b1c41839235d3dc19895f682108 Merge "Allow customization of db sync command line" 33f91fafb02a3d1a0f638505e23169cb9292d68a Bump RDO packages to tested repos 42d918040db4969959c2a7bb82f59f000c8f18a7 Fix leaking environment variables in tests ea12fb2d54ff22b4029112910a742316f1189c91 Allow customization of db sync command line Change-Id: I7d286c5322e5ca077ec7d9ae17f600ba16485ae6 Update manila to 05503844b9495a7142716593454c83f060daed54 05503844b9495a7142716593454c83f060daed54 Merge "Initial msync run for all Puppet OpenStack modules" 3e3bee59f49730320a501d9a4c355577212d03a8 Bump RDO packages to tested repos 06540a002703e92b2abc6131cd48bd15544d4819 Initial msync run for all Puppet OpenStack modules Change-Id: I7d0cca711687df6e8737b7769de72ec0da8e01e3 Update module-collectd to 0a4ccb7b96303c2f12fa07e887fad4c89a8bc0f5 0a4ccb7b96303c2f12fa07e887fad4c89a8bc0f5 Merge pull request #342 from puppet-community/334_curl_json_template f30ecd104af53ef061eea299ad72a2cfe5e0aa66 Merge pull request #344 from puppet-community/bdellegrazie-fix-class-tests e34a2d730a9f4363742508f53cfa48e4a7850410 also fix templates which *uses* collectd_version ceb94b3a7f45961e204053ad88e3077c5d92ea8d Fix rspec tests to use new collectd_real_version fact 9c7c276f6a043640c460f97078d9950e1d10edfc idempotence: make output deterministic in curl_json e9dadff84d31231c99c010babbce116ee328c008 Merge branch 'bdellegrazie-fix-multiple-puppet-runs' 29dd796685469b3dc74a973eefca62ac1ed6e27f Improve version handling to avoid multiple puppet runs for some situations 72998ebbfd22e5cafc350527be1deab1c6fb90ac Merge pull request #322 from intelliad-media/filter be95b4a957677af18696afee57fdd026c4f8f182 implement new filter plugin 8b881500c794b890c6b8d2bd219f901ddde5fbdc Merge pull request #319 from intelliad-media/master 02d919e30c0fb4ea4b534b660d292da9eb33450c initial dbi plugin 9dfbceb2809faae5d90ac2318cc579a77751397a Merge pull request #328 from danzilio/package-file-service d0d8ac277d82530f5cdbfc9b22f8031043a550d3 Adding tests 68d05f74d15414da96b1394c397605e9b4ebe3c8 Factor our resources into classes Change-Id: Ie774d721170cd38fe1b39786f33a966aed39241f Update mysql to 1823c7cd645017cdb015faf590edfd46be402457 1823c7cd645017cdb015faf590edfd46be402457 Merge pull request #759 from mhaskel/merge_3.6.x e1f4b83226a29d52874a63aff545536c38d31f78 Update changelog 97b8200a5f93d1a6853a8994229183706e6e989e Improved user validation and munging 57956783fa62b905e73cba6830d74da50dd10765 updates to 3.6.1 prep 1f575065b3dcb1c46e6b8f38548f17d24587cf24 3.6.1 prep c17c46552bf903bfc0a95679d296cbcd29e8fef8 Merge pull request #751 from mcanevet/patch-1 6228846ae00e2c154380b8f98381294ec740347f Fix when not managing config file Change-Id: I42d959edb07663d2940a3a26cfaa26035ac3f191 Update neutron to 2c1bca9641b15309b4eb9d761dc4293b1bb9ae85 2c1bca9641b15309b4eb9d761dc4293b1bb9ae85 Merge "Accommodate for VPNaaS package name change in RDO" 0a9e38e192505c507068e9c1981021bdc3c148c2 Merge "Introduce neutron::db class" f91ec484690d078b93757f109380eac11da032fb Merge "Restart Neutron agents if packages are updated" 66f7a16b2e9d4cad62ca1e5b30e563abeb677e33 Merge "Add support for rpc_response_timeout option" a9522d8b89391516c8e02434e52fb76b9f345f04 Merge "Allow greater flexibility in the kind of parameter passed to ml2.pp" 35067ada732bc092f09843f75d45c43fc9d079b8 Merge "Filename change for config-dir for ml2 cisco nexus mech driver." c66f367183097e17c5824aeea49152bd26a31156 Add support for prevent_arp_spoofing option afa888e0c67f717fe1bfa68e9c3eb515f42ead3f Bump RDO packages to tested repos db3418c2c904a325a71114969805b85a28027095 Merge "Remove unecessary constraint between Package and Config resource" 9a60cbd1e426488408af313ec0bcfd3a0afbd68f Restart Neutron agents if packages are updated d84daa354305c8629fa34e28b567e8afbfd22f67 Remove unecessary constraint between Package and Config resource a1627ed34de76d9ffec853b6dfb27b14301c5862 Add support for rpc_response_timeout option 7b54f896aa1a5303c7c79206f13c46149447c9df Introduce neutron::db class e00d74cff88be032bbd5879cf527675a317eb3ce Allow greater flexibility in the kind of parameter passed to ml2.pp 6b78ac4efae8ea2e01a1e61ac36fa9327d1724ff Filename change for config-dir for ml2 cisco nexus mech driver. 5c9b34f028e26ae3bfb1d6449a9641d76687c571 Accommodate for VPNaaS package name change in RDO Change-Id: Ie9a630f74a4a35f7fe9b55ef33dd7c5ac2bb092e Update nova to 0d57b76bf6c9a8989127cd16505ee62abc049087 0d57b76bf6c9a8989127cd16505ee62abc049087 Merge "remove openstackocci installation feature" ee5379858dd7dfe65bd0f7ce25988a7363fc5b0b Merge "Add kombu_reconnect_delay option" 701aa1c81dcb033f3dd212364b88a5279082c16e Merge "rabbitmq: do not manage rabbitmq service anymore" abd3d52764dd92e9c85d63670186a9140ba5bdf4 Add kombu_reconnect_delay option 14b3267ccc2ff344162e2b7214ac65a5b41cd056 Merge "Handle libvirt/cpu_model option" 7a45094dbb304edec06419772630c9b75e05b8df Merge "Remove dead nova providers" 0500f9315b8f6580178ccc3ac1a3dd84f23d1a19 rabbitmq: do not manage rabbitmq service anymore 3e0a9bcb8e9a069adbf2a92ae40b536d80cf0002 Merge "volume: allow to change catalog_info" 8a4c64b4113db62e4eb8fd405da6761d88c39f88 Remove dead nova providers 5fbdbfc7389b44ecf98aa51e393d2c419c6e9dbd Bump RDO packages to tested repos 465ad43f01aa5a32ffe646b9b0c0a73b3293ba68 volume: allow to change catalog_info 3306232e8b33f4ff2e4c46dbd436c61b3c3004d8 Merge "api: add default_floating_pool parameter" f3cbca7a31ffabb4764217d2bf3ca3f2dd5b1605 Merge "Avoid empty notification driver" 65f40acac36b14a266a65e7fcea7981402507543 Avoid empty notification driver aa8cf7ee730555b7ae18fe94d2a53a17ccde9fe5 remove openstackocci installation feature 83ea9464a5c99733521541095104fa34d6ee2614 api: add default_floating_pool parameter 708d778812f8a57315f4e05b990b3782d2e4c69c Handle libvirt/cpu_model option Change-Id: Idfeca1e6d7632245d47f230ffc9915314205390a Update openstacklib to f189ec154a7a11721539e841ea2a61850cbddfeb f189ec154a7a11721539e841ea2a61850cbddfeb Merge "Allow to path custom fragment to vhost" 670e2de5ad79b798107cb7f3ae717f72d3293b8b Allow to path custom fragment to vhost 74de9e1d3434e35e2ef7277090738533f27c0099 Create is_service_default function Change-Id: Ied99e27a48778160e1220633f9dfca6ff99e16c9 Update pacemaker to 733c1088ccfa24739929af7a8612ff0ade46bc6f 733c1088ccfa24739929af7a8612ff0ade46bc6f Merge pull request redhat-openstack#60 from redhat-openstack/corosync_flexibility 124056af6c6191e4d8dc87a6024a8cad35bb4f8a Allow one to specify some corosync parameters Change-Id: I5b125f1a13d81624b130fb6aaa8eb0d3f92e432a Update qpid to 4a3c8f0bceacb315de49530faf1325e3daeb02d0 4a3c8f0bceacb315de49530faf1325e3daeb02d0 Convert Modulefile to metadata.json. 7a1cf5c405da7fdfbdb68fe86c2b8d65882585eb Update changelog for 1.0.3. Change-Id: Id643c8a307773936588ae4f5ee0be72a4fd11284 Update sahara to 486368ccff7cbaac7ae3697fa562cccab2afa2ac 486368ccff7cbaac7ae3697fa562cccab2afa2ac Merge "Introduce Sahara extended logging class" 292ad6c4e983c9549328075af5583431fc74b870 Introduce Sahara extended logging class 8099a5d53c9b399b4ad80018405fa55dd937dc7a Change defaults value for Sahara Keystone credentials df620c1963cd869324b4501c6a3d0ea06b5ee210 Bump RDO packages to tested repos e8f8406f7be3770bef09beeecc5470644bf3f8ea Merge "Remove POSIX file modes." 374255be50c0e505cf952895cf98f00ed2924ff4 Merge "Rely on autorequire for config resource ordering" 2b3f41a352de8e44a6ad6c78afb4cc617c7e28a0 Merge "Revert "Fix Sahara installation for Ubuntu"" fa0bda834b56614e4a34318ba07134377ab8fbd2 Remove POSIX file modes. 20b3cafc0a082ca5440eef80f1c0e8e79045f718 Rely on autorequire for config resource ordering ebc168957c6a1be07b6bd410939a5c0e02ade3a7 Revert "Fix Sahara installation for Ubuntu" Change-Id: I7c693709c507b087eac848d3c353f989e7df09ce Update stdlib to 76db981 76db981 Merge pull request #533 from HelenCampbell/MODULES-2614-Improved c7c4d41 Added acceptance test and updated readme 6f1d164 Check for numeric values as empty fails on those 48b658f Merge pull request #532 from DavidS/fix-is_a-readme bfa21ed (FM-3701) Update README for is_a 39e81aa Merge pull request #531 from asasfu/improvement/service_provider_fact 440245d fixup-PR#506 Speed improvements in facter resolution 4d1bca3 Merge pull request #506 from binford2k/feature/service_provider_fact 6bb1c27 Merge pull request #530 from HelenCampbell/MODULES-2614 92b068a Adding update to empty function readme cebb9f3 Merge pull request #528 from mhaskel/is_a_fixes b20239e Update is_a acceptance tests to only run on puppet4 97bd656 Merge pull request #527 from mhaskel/511_compatibility 799c38e Fix backwards compatibility from #511 66e118a Add a service_provider fact Change-Id: Ic49705dfe759c1791a3e63151d71abdec3005d67 Update swift to 79b596b817bb10dad505d5f79c6e905576c2f092 79b596b817bb10dad505d5f79c6e905576c2f092 Merge "Add support for DLO configuration." 4ee7b74aed5bc609018ed3937deb3684fb561fd3 Add support for DLO configuration. df70d51f16c1f9fe7245ef6f6a44e0db44f9b708 Merge "Warn that object storage parameter mount_check changes next release" b3ff1ac9d4fea5a53ce246e1210be83fc7d65916 Warn that object storage parameter mount_check changes next release 2359924d48b3e0bde4e455bc65e0c1e373e8e965 Merge "provide means to disable log_requests in config templates" f34cd0865b337127e6184db8699016bc59906eee Bump RDO packages to tested repos c2bb2fb31ee4c5a23fe4a218f195da2699fdfe06 provide means to disable log_requests in config templates Change-Id: I63a416c54262784c50cc4e702e5776043eacddd7 Update tempest to cf51820becc5e1b6f17435dd3e267643544f7e25 cf51820becc5e1b6f17435dd3e267643544f7e25 Allow to activate Sahara tests 026c4eddd3e9fff986cf52a091cf80a1017a4309 introduce dashboard parameters Change-Id: Ib0e9250d22583eca604eadc316461d4e3849de34 Update trove to c5b0e46a63125fa7b87b6461ac1dd0de49b8a881 c5b0e46a63125fa7b87b6461ac1dd0de49b8a881 Bump RDO packages to tested repos Change-Id: I42bb97f867d410adeb394beb30aa582e621fa18c Update vswitch to 378364a3aea6d9c2b6610db334a8e06b7104a8a8 378364a3aea6d9c2b6610db334a8e06b7104a8a8 Merge "Support for FreeBSD" 55637faa6f0c4cfd070e52a1b80c7d55fbea7241 Support for FreeBSD Change-Id: Iaf1c9909413befa923c9134f6f6e5536a38b3a76
xbezdick · Sep 29, 2015 · e66b6ae · e66b6ae
1 parent 55967fa
commit e66b6ae
Show file tree

Hide file tree

Showing 208 changed files with 4,478 additions and 1,990 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -1,13 +1,13 @@
 mod 'apache',
-  :commit => '346c0e7f50664ba23a656bc1dbeeda653dedb318',
+  :commit => '4037a84f48929174ba06850fa94089fc2cdfea57',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
   :commit => '9a3b74b0dbb655a3afcbc8bdee442f2143420b72',
   :git => 'https://github.com/aimonb/puppet_aviator.git'
 
 mod 'ceilometer',
-  :commit => '67aa7266e75de57daaa88f1d8b2a6b887c64dfc6',
+  :commit => '270e800e0d824a2741728d3ad28721b197cb1c6a',
   :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 => '3259caa0efe369f4dfe6dd69791cfade2326e435',
+  :commit => '8f3fa4c8227c9ed029fc7b6d3a8f672a49dfc264',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -43,7 +43,7 @@ mod 'galera',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => '03e1e00cbd2f33f937a1a2919e3c444f67fa0731',
+  :commit => 'e5f3e1358aec833398660b4194cfe074786b5f7c',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
@@ -59,11 +59,11 @@ mod 'haproxy',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => 'f5193ad715a3a06b00ae0894292d46af19bcfb0e',
+  :commit => 'b608fcebda837ae4c9cdf2d8a8e6e3615f111cf5',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '4ff00b34e3af7f6608472ef0f5787e659c4fca6c',
+  :commit => '34d3c0a79af9b1025466eae01ff9c6c042abed6c',
   :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 => '557afd41e14671f409215261ccc879818c952a4c',
+  :commit => '9c976a61d0ac9c7bbf2521c89ea9a01f9c4a0d63',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'keepalived',
   :commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => '40a1d04410e0cc2bdfd1a8fa2ccca70eb202993f',
+  :commit => '240301fe01982b1c41839235d3dc19895f682108',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'manila',
-  :commit => '87ed677909ecdae78a3459b13118117c740b127e',
+  :commit => '05503844b9495a7142716593454c83f060daed54',
   :git => 'https://github.com/openstack/puppet-manila.git'
 
 mod 'memcached',
   :commit => '8e6fdfda7400c40176baa5063e05ff716cc5fd73',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => '07378b476f892648c3ef9cac6f1b0ed481917b17',
+  :commit => '0a4ccb7b96303c2f12fa07e887fad4c89a8bc0f5',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',
@@ -107,7 +107,7 @@ mod 'mongodb',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',
-  :commit => '8b365689caceb5dc0bcb0763b4a7b369c6434778',
+  :commit => '1823c7cd645017cdb015faf590edfd46be402457',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',
@@ -119,11 +119,11 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '3f8d040caa7143f4c117a889c464ba36db58d39e',
+  :commit => '2c1bca9641b15309b4eb9d761dc4293b1bb9ae85',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => '21029f04f733de72d69bac3d729f68baf9038c74',
+  :commit => '0d57b76bf6c9a8989127cd16505ee62abc049087',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',
@@ -139,19 +139,19 @@ mod 'openstack_extras',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => '745dccbfcd3637821f4f9135f4489e865184da82',
+  :commit => 'f189ec154a7a11721539e841ea2a61850cbddfeb',
   :git => 'https://github.com/openstack/puppet-openstacklib.git'
 
 mod 'pacemaker',
-  :commit => '9fad1c824f814e1248367108f1c9d1c4b13697eb',
+  :commit => '733c1088ccfa24739929af7a8612ff0ade46bc6f',
   :git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'
 
 mod 'puppet',
   :commit => '0ccbbac3d822d440ca7c339fbce8a8860ea7cbaf',
   :git => 'https://github.com/purpleidea/puppet-puppet.git'
 
 mod 'qpid',
-  :commit => '9ffb2788c536f1694980e07a43e8133ff85fa28c',
+  :commit => '4a3c8f0bceacb315de49530faf1325e3daeb02d0',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
@@ -171,7 +171,7 @@ mod 'rsync',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
-  :commit => '1b1e9fb9d4085200495ad09ff978f7b941d48817',
+  :commit => '486368ccff7cbaac7ae3697fa562cccab2afa2ac',
   :git => 'https://github.com/openstack/puppet-sahara.git'
 
 mod 'snmp',
@@ -187,19 +187,19 @@ mod 'staging',
   :git => 'https://github.com/nanliu/puppet-staging.git'
 
 mod 'stdlib',
-  :commit => '9b1932c538354c1b360838c8cf7b942af314c99d',
+  :commit => '76db98120acab12d5aab3adaff6d2aa1d970c1e8',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '96b4f5c7c5c5fd10c0ddee41962531aa5021d906',
+  :commit => '79b596b817bb10dad505d5f79c6e905576c2f092',
   :git => 'https://github.com/openstack/puppet-swift.git'
 
 mod 'sysctl',
   :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
   :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
 
 mod 'tempest',
-  :commit => '89bd7231f5b443d34695c9954ef48230649077f2',
+  :commit => 'cf51820becc5e1b6f17435dd3e267643544f7e25',
   :git => 'https://github.com/openstack/puppet-tempest.git'
 
 mod 'timezone',
@@ -211,7 +211,7 @@ mod 'tripleo',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '2c907a77f9a8a76516f784fbf3a2bca213876e4c',
+  :commit => 'c5b0e46a63125fa7b87b6461ac1dd0de49b8a881',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',
@@ -227,7 +227,7 @@ mod 'vlan',
   :git => 'https://github.com/derekhiggins/puppet-vlan.git'
 
 mod 'vswitch',
-  :commit => '934d053cb90624256df2a5468e9783d016e9f270',
+  :commit => '378364a3aea6d9c2b6610db334a8e06b7104a8a8',
   :git => 'https://github.com/openstack/puppet-vswitch.git'
 
 mod 'xinetd',

diff --git a/apache/README.md b/apache/README.md
@@ -289,7 +289,7 @@ You can customize parameters when declaring the `apache` class. For instance, th
 
 ~~~ puppet
 class { 'apache':
-  default_vhosts => false,
+  default_vhost => false,
 }
 ~~~
 
@@ -2009,6 +2009,10 @@ Location of the Kerberos V5 keytab file. Not set by default.
 
 Strips @REALM from username for further use. Not set by default.
 
+##### `limit_request_field_size`
+
+[Limits](http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize) the size of the HTTP request header allowed from the client. Default is 'undef'.
+
 ##### `logroot`
 
 Specifies the location of the virtual host's logfiles. Defaults to '/var/log/<apache log location>/'.
@@ -2916,7 +2920,7 @@ Allows an valid content setting to be set or altered for the application request
       docroot     => '/path/to/directory',
       directories => [
         { path                  => '/path/to/directory',
-          shib_require_setting  => 'requiresession 1',
+          shib_request_settings => { 'requiresession' => 'On' },
           shib_use_headers      => 'On',
         },
       ],

diff --git a/apache/manifests/default_mods.pp b/apache/manifests/default_mods.pp
@@ -42,6 +42,9 @@
       'debian': {
         include ::apache::mod::authn_core
         include ::apache::mod::reqtimeout
+        if versioncmp($apache_version, '2.4') < 0 {
+          ::apache::mod { 'authn_alias': }
+        }
       }
       'redhat': {
         include ::apache::mod::actions

diff --git a/apache/manifests/vhost.pp b/apache/manifests/vhost.pp
@@ -131,6 +131,7 @@
   $krb_auth_realms             = [],
   $krb_5keytab                 = undef,
   $krb_local_user_mapping      = undef,
+  $limit_request_field_size    = undef,
 ) {
   # The base class must be included first because it is used by parameter defaults
   if ! defined(Class['apache']) {
@@ -222,6 +223,10 @@
   }
 
   validate_bool($auth_kerb)
+
+  if $limit_request_field_size {
+    validate_integer($limit_request_field_size)
+  }
   # Input validation ends
 
   if $ssl and $ensure == 'present' {
@@ -946,6 +951,15 @@
       content => template('apache/vhost/_filters.erb'),
     }
   }
+  # Template uses:
+  # - $limit_request_field_size
+  if $limit_request_field_size {
+    concat::fragment { "${name}-limits":
+      target  => "${priority_real}${filename}.conf",
+      order   => 330,
+      content => template('apache/vhost/_limits.erb'),
+    }
+  }
 
   # Template uses no variables
   concat::fragment { "${name}-file_footer":

diff --git a/apache/spec/defines/vhost_spec.rb b/apache/spec/defines/vhost_spec.rb
@@ -321,6 +321,7 @@
           'krb_auth_realms'             => ['EXAMPLE.ORG','EXAMPLE.NET'],
           'krb_5keytab'                 => '/tmp/keytab5',
           'krb_local_user_mapping'      => 'off',
+          'limit_request_field_size'    => '54321',
         }
       end
       let :facts do
@@ -450,6 +451,8 @@
         :content => /^\s+Krb5Keytab\s\/tmp\/keytab5$/)}
       it { is_expected.to contain_concat__fragment('rspec.example.com-auth_kerb').with(
         :content => /^\s+KrbLocalUserMapping\soff$/)}
+      it { is_expected.to contain_concat__fragment('rspec.example.com-limits').with(
+        :content => /^\s+LimitRequestFieldSize\s54321$/)}
     end
     context 'set only aliases' do
       let :params do
@@ -601,6 +604,7 @@
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-fastcgi') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-suexec') }
       it { is_expected.to_not contain_concat__fragment('rspec.example.com-charsets') }
+      it { is_expected.to_not contain_concat__fragment('rspec.example.com-limits') }
       it { is_expected.to contain_concat__fragment('rspec.example.com-file_footer') }
     end
   end

diff --git a/apache/templates/mod/security.conf.erb b/apache/templates/mod/security.conf.erb
@@ -59,10 +59,13 @@
     SecAuditLog /var/log/apache2/modsec_audit.log
     SecTmpDir /var/cache/modsecurity
     SecDataDir /var/cache/modsecurity
+    SecUploadDir /var/cache/modsecurity
 <% else -%>
     SecDebugLog /var/log/httpd/modsec_debug.log
     SecAuditLog /var/log/httpd/modsec_audit.log
     SecTmpDir /var/lib/mod_security
     SecDataDir /var/lib/mod_security
+    SecUploadDir /var/lib/mod_security
 <% end -%>
+    SecUploadKeepFiles Off
 </IfModule>
diff --git a/apache/templates/vhost/_additional_includes.erb b/apache/templates/vhost/_additional_includes.erb
@@ -2,9 +2,8 @@
 
   ## Load additional static includes
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 && @use_optional_includes -%>
-IncludeOptional "<%= include %>"
+  IncludeOptional "<%= include %>"
 <%- else -%>
-Include "<%= include %>"
+  Include "<%= include %>"
 <%- end -%>
-
 <% end -%>
diff --git a/apache/templates/vhost/_limits.erb b/apache/templates/vhost/_limits.erb
@@ -0,0 +1,5 @@
+
+  ## Limit Request Values
+<% if @limit_request_field_size -%>
+  LimitRequestFieldSize <%= @limit_request_field_size %>
+<% end -%>
diff --git a/ceilometer/lib/puppet/provider/file_line_after/ruby.rb b/ceilometer/lib/puppet/provider/file_line_after/ruby.rb