redhat-openstack · strider · Feb 19, 2015 · Feb 19, 2015 · Feb 19, 2015 · Feb 19, 2015
diff --git a/Puppetfile b/Puppetfile
@@ -1,9 +1,9 @@
 mod 'apache',
-  :commit => '1417312b493ea79f88f22cc8b961d8db08cb9273',
+  :commit => 'cd4b1aaf1f55b80d8be3133e9293d7708878bbf2',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
-  :commit => 'd308a263318399f0de7fd760826f8b98b2b59aba',
+  :commit => '9a3b74b0dbb655a3afcbc8bdee442f2143420b72',
   :git => 'https://github.com/aimonb/puppet_aviator.git'
 
 mod 'ceilometer',
@@ -15,87 +15,87 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => 'd120750c1dd000411fd41b0fe9bcb3d6e47aa877',
+  :commit => '8cc6d0e60ee6d9d0c1ebcf3523b07c3024c47064',
   :git => 'https://github.com/stackforge/puppet-cinder.git'
 
 mod 'common',
-  :commit => '2c0ed2844c606fd806bde0c02e47e79c88fab4a9',
+  :commit => '165e2adc3ab559597f461e6eae3eb004967070f9',
   :git => 'https://github.com/purpleidea/puppet-common.git'
 
 mod 'concat',
-  :commit => '644fb1b6dc8b64accc4d1208d6127b79a08a38b7',
+  :commit => 'f6e9f0a4ec925aa0c77975940ea2a834a8029dc6',
   :git => 'https://github.com/puppetlabs/puppetlabs-concat.git'
 
 mod 'firewall',
-  :commit => '6b308177c3d279083078955942969c92b145eba0',
+  :commit => '89bbaa5f2fbce4726ceba3014676f82229e54714',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
 
 mod 'galera',
   :commit => '92463ad0567c066796b7fac4a1466e6a60621f6c',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => '553d098745bdbe4d22fba7eef6978444fee258fe',
+  :commit => '9a4568c3610d96ab0fe8543b133b317aca801b76',
   :git => 'https://github.com/stackforge/puppet-glance.git'
 
 mod 'gluster',
-  :commit => '6c962083d8b100dcaeb6f11dbe61e6071f3d13f0',
+  :commit => 'ae24ecc28844404ff3b29ff80230a1564485b2b8',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
   :commit => '9d7e2042282a893da08aa4715a220516036fcc1e',
   :git => 'https://github.com/stackforge/puppet-gnocchi.git'
 
 mod 'haproxy',
-  :commit => 'f381510e940ee11feb044c1c728ba2e5af807c79',
+  :commit => 'cf5c18ca25b8bb201e2dc61af5a938fe5b05ba70',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '511c3dbf303acb6042cc4b20d68858a67ce69c97',
+  :commit => 'a0e1f3ab69995b7183e8eb3532e5c0acb80adfca',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '1c31420b4a444443eba2d9d1710b1200d905ccdf',
+  :commit => '915f0741adcd4becfa2f5156203a5c06a6cc62d6',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',
-  :commit => 'be5fc47f00466a2e6293145b3a0d4fcb586bcf15',
+  :commit => '606de6971d019fa9557d0866e90942a3d6e06a97',
   :git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'
 
 mod 'ipa',
   :commit => '4e634b31633bc956341e20980233107a6d5dc1f9',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '2edcdcfbcc02e868982f2158d13a75037f8c702e',
+  :commit => '6733465482dc092486ee7d9227e9068fee506d6b',
   :git => 'https://github.com/stackforge/puppet-ironic.git'
 
 mod 'keystone',
-  :commit => '36e4c8861803c7b698a3f36612fffeb1614646d1',
+  :commit => '6b0e35989aa380fc5c2c363de9d8512086f0c260',
   :git => 'https://github.com/stackforge/puppet-keystone.git'
 
 mod 'manila',
   :commit => '46ba0607b678b3ba76cd5f5245d381f8712201b8',
   :git => 'https://github.com/stackforge/puppet-manila.git'
 
 mod 'memcached',
-  :commit => '49dbf102fb6eee90297b2ed6a1fa463a8c5ccee7',
+  :commit => '5869cadc82553738610b305ce15842ab2a3a4313',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => 'cf79540be4623eb9da287f6d579ec4a4f4ddc39b',
+  :commit => '1830403421c03c10a00552075e164214e97c86da',
   :git => 'https://github.com/pdxcat/puppet-module-collectd.git'
 
 mod 'module-data',
-  :commit => '159fc5e0e21ce9df96c777f0064b5eca88e29cae',
+  :commit => '010c9eb3496f515582a4d4868154e5fb246ee9b8',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
-  :commit => 'fe562b86f388a6d107bb1f3cb3b32a3978f59c2a',
+  :commit => '4f5ca99fcba4339a8093d2cb329f5498866a8c8c',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',
-  :commit => '40dd1805886aee56dc02860565f161c6e3b4c7e5',
+  :commit => '3f1871369a420e41f6814d9a5fc28b641ad39044',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k-vsm',
@@ -107,83 +107,83 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => 'b561004004b62488a5cdbaf8dd45c4ef522c68c6',
+  :commit => 'ba0eb6f2f6db6b4a9d455a3ea54150ccc8020be7',
   :git => 'https://github.com/stackforge/puppet-neutron.git'
 
 mod 'nova',
-  :commit => 'f0227c71b1b9694560fcf845fa2b47d4eeee8b05',
+  :commit => '00e744a9b1568ab832fd46203baa83575dcf94ec',
   :git => 'https://github.com/stackforge/puppet-nova.git'
 
 mod 'nssdb',
-  :commit => 'b3799a9a7c62c3b5b7968f9860220a885b45fb8a',
+  :commit => '2e163a21fb80d828afede2d4be6214f1171c4887',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',
-  :commit => '8f697e32bc279b36ada752273e6c788716b95315',
+  :commit => '05b6a27be2ca2fc011eace13782d958cf6fe4999',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
   :commit => '9693efeb878b305bd00e7ef98cb25e1a874d21bf',
   :git => 'https://github.com/stackforge/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => 'b7d3c8eaaf47ffbddb50cd942f8654e1aa8fe2f2',
+  :commit => '83320443dfd08fc2e4ffbdb0c90da9db17a214fb',
   :git => 'https://github.com/stackforge/puppet-openstacklib.git'
 
 mod 'pacemaker',
   :commit => '52acfd9c31e0801cedf970929851d4bece5cf79b',
   :git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'
 
 mod 'puppet',
-  :commit => 'bd467cae15eba9ca44274034d2593b0eaf30518d',
+  :commit => '97b41d9fdadbe98f965d515b55c35a65da596ef2',
   :git => 'https://github.com/purpleidea/puppet-puppet.git'
 
 mod 'qpid',
   :commit => '9ffb2788c536f1694980e07a43e8133ff85fa28c',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => '4832bd61b5b1bfea7c9cc985508e65cd10081652',
+  :commit => '654f3433aaa3c7abaebb0fb2c4574e1ce5da0fcb',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',
-  :commit => 'd72af9ab3c2911b6dc18c5cc12e700630ebdcfb2',
+  :commit => '51e35cc9a743dd8f992effae25d92e18aafe8b46',
   :git => 'https://github.com/arioch/puppet-redis.git'
 
 mod 'remote',
   :commit => '35cc5571593d21408d625bd8ee35217345ec502a',
   :git => 'https://github.com/paramite/puppet-remote.git'
 
 mod 'rsync',
-  :commit => '357d51f3a6a22bc3da842736176c3510e507b4fb',
+  :commit => '8fe65d0b70c0615a63551ae4af2bb5f808ef2421',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
-  :commit => '66301097ee42840831f8c8c7cd0482e3e2325df5',
+  :commit => '6781e080362fa03a7bde0feaa52e2fc0d10b4c8b',
   :git => 'https://github.com/frozencemetery/puppet-sahara.git'
 
 mod 'ssh',
-  :commit => 'd6571f8c43ac55d20a6afd8a8ce3f86ac4b0d7a4',
+  :commit => 'e5cfeae06a16497382072d80c65c901aa0e696ea',
   :git => 'https://github.com/saz/puppet-ssh.git'
 
 mod 'staging',
-  :commit => '887275d8fb20e148c6f9eb327f1f6c8ea5ee280f',
+  :commit => 'bc434a71e19aae54223d57c274e2e1a7f9546d5e',
   :git => 'https://github.com/nanliu/puppet-staging.git'
 
 mod 'stdlib',
-  :commit => '62e8c1d76902e6f22cb9f7b3abd43e757b4130a3',
+  :commit => 'ad5727266a5c243cebf8007b9b00ffc80674b4fc',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '2c61fd3187b2f367aa4738bb8239933aec1ff883',
+  :commit => '0d40df78fe40b002380cb3c58ac22dc6ee8b913f',
   :git => 'https://github.com/stackforge/puppet-swift.git'
 
 mod 'sysctl',
   :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
   :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
 
 mod 'tempest',
-  :commit => '7a3369949fc8af41e190dd8115391354a7575ecb',
+  :commit => '48a850e38f7937e19b687f7a18c6b7d388ea1069',
   :git => 'https://github.com/stackforge/puppet-tempest.git'
 
 mod 'timezone',
@@ -195,11 +195,11 @@ mod 'tripleo',
   :git => 'https://github.com/stackforge/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => 'c345e128c7fec585acf00b5a275a78cd1ae89f03',
+  :commit => 'c6d7addb151d572b5146d59898179434d1c2ba73',
   :git => 'https://github.com/stackforge/puppet-trove'
 
 mod 'vcsrepo',
-  :commit => '6f7507a2a48ff0a58c7db026760a2eb84e382a77',
+  :commit => 'b394f6961d984190a9ead8a3465f360ae5c6d365',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
 
 mod 'vlan',
@@ -211,6 +211,6 @@ mod 'vswitch',
   :git => 'https://github.com/stackforge/puppet-vswitch.git'
 
 mod 'xinetd',
-  :commit => '6b02de8d4f30a819eb404048e4258e3a5e8023c8',
+  :commit => '5e31388979e8f3a667899fad5cefa95289e22281',
   :git => 'https://github.com/puppetlabs/puppetlabs-xinetd.git'
 
diff --git a/apache/.gitignore b/apache/.gitignore
@@ -5,3 +5,5 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+.idea/
+*.iml
diff --git a/apache/CHANGELOG.md b/apache/CHANGELOG.md
@@ -1,3 +1,62 @@
+##2015-02-17 - Supported Release 1.3.0
+###Summary
+
+This release has many new features and bugfixes, including the ability to optionally not trigger service restarts on config changes.
+
+####Features
+- New parameters - `apache`
+  - `service_manage`
+  - `use_optional_includes`
+- New parameters - `apache::service`
+  - `service_manage`
+- New parameters - `apache::vhost`
+  - `access_logs`
+  - `php_flags`
+  - `php_values`
+  - `modsec_disable_vhost`
+  - `modsec_disable_ids`
+  - `modsec_disable_ips`
+  - `modsec_body_limit`
+- Improved FreeBSD support
+- Add ability to omit priority prefix if `$priority` is set to false
+- Add `apache::security::rule_link` define
+- Improvements to `apache::mod::*`
+  - Add `apache::mod::auth_cass` class
+  - Add `threadlimit`, `listenbacklog`, `maxrequestworkers`, `maxconnectionsperchild` parameters to `apache::mod::event`
+  - Add `apache::mod::filter` class
+  - Add `root_group` to `apache::mod::php`
+  - Add `apache::mod::proxy_connect` class
+  - Add `apache::mod::security` class
+  - Add `ssl_pass_phrase_dialog` and `ssl_random_seed_bytes parameters to `apache::mod::ssl` (MODULES-1719)
+  - Add `status_path` parameter to `apache::mod::status`
+  - Add `apache_version` parameter to `apache::mod::version`
+  - Add `package_name` and `mod_path` parameters to `apache::mod::wsgi` (MODULES-1458)
+- Improved SCL support
+  - Add support for specifying the docroot
+- Updated `_directories.erb` to add support for SetEnv
+- Support multiple access log directives (MODULES-1382)
+- Add passenger support for Debian Jessie
+- Add support for not having puppet restart the apache service (MODULES-1559)
+
+####Bugfixes
+- For apache 2.4 `mod_itk` requires `mod_prefork` (MODULES-825)
+- Allow SSLCACertificatePath to be unset in `apache::vhost` (MODULES-1457)
+- Load fcgid after unixd on RHEL7
+- Allow disabling default vhost for Apache 2.4
+- Test fixes
+- `mod_version` is now built-in (MODULES-1446)
+- Sort LogFormats for idempotency
+- `allow_encoded_slashes` was omitted from `apache::vhost`
+- Fix documentation bug (MODULES-1403, MODULES-1510)
+- Sort `wsgi_script_aliases` for idempotency (MODULES-1384)
+- lint fixes
+- Fix automatic version detection for Debian Jessie
+- Fix error docs and icons path for RHEL7-based systems (MODULES-1554)
+- Sort php_* hashes for idempotency (MODULES-1680)
+- Ensure `mod::setenvif` is included if needed (MODULES-1696)
+- Fix indentation in `vhost/_directories.erb` template (MODULES-1688)
+- Create symlinks on all distros if `vhost_enable_dir` is specified
+
 ##2014-09-30 - Supported Release 1.2.0
 ###Summary
 

diff --git a/apache/Gemfile b/apache/Gemfile
@@ -2,7 +2,8 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
   gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false
+  gem 'rspec-core', '3.1.7',     :require => false
+  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false