Update apache to 22ed027

22ed027 Merge pull request #1221 from mpdude/custom-config-requires-basic-setup
9d8efec Install all modules before adding custom configs
b4885f2 Merge pull request #1223 from DavidS/add-vhost-enable-pattern
4c87d22 Add option to configure the include pattern for the vhost_enable dir
932f0d0 Merge pull request #1220 from tobixen/ssl_cipher_rc4_deprecated
445d436 RC4 is deprecated, ref https://community.qualys.com/blogs/securitylabs/2013/09/17/updated-ssltls-deployment-best-practices-deprecate-rc4 - usage will downgrade the SSL rating from A to B on their rating service at https://www.ssllabs.com/ssltest/

Change-Id: I8fcd6a24928fade065f2625b5e09b5d965d7c827

Update ceilometer to 60a2c46196d0fdb4675a7482648a85fc928ca0cf

60a2c46196d0fdb4675a7482648a85fc928ca0cf spec: Enable webmock connect to IPv4 link-local
d0bc29d6b04d6a5d416be6b7665627b0080449d3 Merge "Put all the logging related parameters to the logging class"
dfa1e8c0aff263d6bceb53357fee6f3cbae45c8e Try to use zuul-cloner to prepare fixtures
183b62b35a32390285c454cc35dbfc7721150944 auth: drop service dependency for Keystone_user_role
577593222a31f6948d13f2408a0bab017a0305cd Put all the logging related parameters to the logging class

Change-Id: I84517254386b4d9b60fd40c37244a7512bd42c5f

Update cinder to 17026a35ecc28e28075bc13580b9740d641094ac

17026a35ecc28e28075bc13580b9740d641094ac Merge "Try to use zuul-cloner to prepare fixtures"
7c1ece76f7411fa1908b6be8cbbcf714ac10539f Merge "Allow RBD host to be configurable"
1ef032b4dc1a2a60d64582a762a0d0d42765f55f Merge "rabbitmq: do not manage rabbitmq service anymore"
e9a95581ddeb7e8fe9f7bf609945174831512e59 Try to use zuul-cloner to prepare fixtures
d41437e0193fa4ac0f2f4ac7ce341b76a4314c6e rabbitmq: do not manage rabbitmq service anymore
667e6c0850672dbbf99381eb92468f95e5591913 Switch cinder to use os_service_default fact
b8fadd3360b235d3d442fa779b2f54d2ec424c78 Add posibility to specify privileged user for Cinder
20affe87e1325741447fe8d7080d989b0ee180f8 type: Add retry to Exec resource
e226c0ed95ce5321dcbf0a3a5188098734b5cab8 Allow RBD host to be configurable

Change-Id: I759f68b53008cbed8c65d649af711e2350444256

Update firewall to 6755b959004f176844cb143690cc83ba621c40de

6755b959004f176844cb143690cc83ba621c40de Merge pull request #573 from cdenneen/patch-1
41fb626e1477de3368ca4db30ac32c5e380f5bd2 Include osrelease check in selinux case statement

Change-Id: I54fefb1242ea87912a6e5a15f32c4f8dd8092daa

Update glance to d6ad1f504eda3f1f0e0613ece9392dd8f78bf7b5

d6ad1f504eda3f1f0e0613ece9392dd8f78bf7b5 Merge "Put all the logging related parameters to the logging class"
f55cebf7b64c03ff098db8c516d70b0119fc0266 Try to use zuul-cloner to prepare fixtures
3231e353206da1efd27cc65302114c861f2cdb45 Put all the logging related parameters to the logging class

Change-Id: I8fbb1083fd2f29a214fa0bf9ea95cbfe68f5e8b5

Update gnocchi to 02692807d218210a27a4043e27b3aa0ac38e8b28

02692807d218210a27a4043e27b3aa0ac38e8b28 Merge "Put all the logging related parameters to the logging class"
e3c0a7a5da801b52a94f4e966065c01fa6ded486 Try to use zuul-cloner to prepare fixtures
328e29c871b02dfee003fb9557027eaca06a03c8 Put all the logging related parameters to the logging class

Change-Id: I0c08ba45f1557fcf9d60221e74b38469f0e7fcc4

Update haproxy to cdcbc19ac3389aadc5d7ec1e9d0631de28e06bf7

cdcbc19ac3389aadc5d7ec1e9d0631de28e06bf7 Merge pull request redhat-openstack#199 from puppetlabs/1.3.x
5a65220fc31675aa48564c0cf680d820441d40b1 Merge pull request redhat-openstack#190 from hunner/release_1.3.0
49b1ba73dc411d0fea70232260088a5a6cebb245 Release 1.3.0

Change-Id: I9af5c5f363ddc0f61c429c56b928088f2cd7cfe9

Update heat to 06953c3d4493e405343704b1beeb1e610cfa75e6

06953c3d4493e405343704b1beeb1e610cfa75e6 Merge "Put all the logging related parameters to the logging class"
6e525091014c281745ddfacf045108182b40dfdf Try to use zuul-cloner to prepare fixtures
9ad6f36ea4cd9b7b20a5cbdb058dbea5105366d9 Put all the logging related parameters to the logging class

Change-Id: I17b2ed6ec18af234c42791cef8c84b62a4211f39

Update horizon to 06e150fa18ff6ebfa00a93553a1576de3ce361f8

06e150fa18ff6ebfa00a93553a1576de3ce361f8 Try to use zuul-cloner to prepare fixtures

Change-Id: Ie18cc8279ae4cb2fca1fbd2ef88f7f564d55e3ef

Update ironic to 50ec0e11608930f5286ee0913d1cd6fde8bf8a55

50ec0e11608930f5286ee0913d1cd6fde8bf8a55 Merge "Put all the logging related parameters to the logging class"
1dec28363987473132ba767b2ad2edd9ccd54a90 Merge "Try to use zuul-cloner to prepare fixtures"
faba2b9163c0e894d262bc26ed37e85f536c8f45 Try to use zuul-cloner to prepare fixtures
0358830fa758847788e1b5aa0452cfb5725135ea Add ironic-inspector support
40ca41aecd3893f9e632a11948d849207913de6a Put all the logging related parameters to the logging class

Change-Id: I0805339d076e83f0574d9085716e90322e73035c

Update keystone to cc2f08164aea815c8e6f1a849edfee6aa75f7dcc

cc2f08164aea815c8e6f1a849edfee6aa75f7dcc Merge "Put all the logging related parameters to the logging class"
4c5c3e0b76e0c0ea5c73b1d76fe0fd9a284fb524 Merge "Pass necessary options to Apache when using WSGI"
7c9e10b9dad5f62c389ac26d74803a799d7eb4db Try to use zuul-cloner to prepare fixtures
94123494c171084b3f044711379f0d9f9b753fda Pass necessary options to Apache when using WSGI
5f15bbb1b608e8bceaa2199aff5b1f81db2d96a4 Merge "Support for Keystone as Identity Provider"
7120da9844e96a6898c3a406c2e36f0d38724552 wsgi: make sure keystone service is stopped before starting httpd
ee2723009e952fade7c4798c23e4c24db51ea54e Put all the logging related parameters to the logging class
cb8bc35d58840fdc7164eb90e870dad70640dbcc Support for Keystone as Identity Provider

Change-Id: I05646957edd8092b42e0034e6ca377b77383386f

Update manila to d8fee807df66314ee3e5c68ee669e8826e327eef

d8fee807df66314ee3e5c68ee669e8826e327eef Merge "Simplify rpc_backend parameter"
f62694fad2b618c3643f46777c9313e0da598f69 Simplify rpc_backend parameter
eba6fe33c5e038d44fa62e638b50df8901ece424 Try to use zuul-cloner to prepare fixtures
23862a28f21a898c4e42cef228f7864137ca372e rabbitmq: do not manage rabbitmq service anymore

Change-Id: If17b2af6288c5e510e6df947c54b6a925a8e7f54

Update module-collectd to 9d07e5b15d3b6f67dd2899ef08dc7d2c20cff0a4

9d07e5b15d3b6f67dd2899ef08dc7d2c20cff0a4 Merge pull request #357 from ghoneycutt/package_install_options
5b8acf3b225b98c39526e6a5c831712bea4158ff Add ability to pass install_options for package in apache plugin
fa0a0b538e8eeb73bfad9e44b845b430b1102f81 Merge pull request #356 from ghoneycutt/add_dns_plugin
f36977307f0e9ce60049feac3eaa469f17c9756e Add ability to specify install_options to collectd package
5f07b70325d6ef343e93153157c1d8ee9fb45570 Add dns plugin
78cd9ca3dc8129e2db774dd1f12c739c65d80188 Merge pull request #353 from puppet-community/modulesync
7f9143e97d8f7588ae6350c538908c8ce77f2db9 fix a spec tests AND a ceph plugin
e7ae140c8cd19ea4f2ef6948d2202f40a75d981d extend rubocop line-limit
c3fd410f7c3781ded08db9bfd710ad01c9fc7202 (manual) rubocop fixups
c42ed715a4b395350cef78eb873e6ae59ffeea86 rubocop:auto_correct
30ff624041a817c50fea76bf27f0b744671a03e1 Update from puppet-community modulesync_configs

Change-Id: I456adb80f741439a16607d38f7023dc36ae4c9f7

Update mysql to 5e6db0bb0fd8b28bb9c7d8f23e67e6ddb8abf616

5e6db0bb0fd8b28bb9c7d8f23e67e6ddb8abf616 Merge pull request #768 from DavidS/modules-2490-fix-daemon_dev_package_name-mariadb
ad204cb622a87fff1088805cb12984080fbc3735 (MODULES-2490) correct the daemon_dev_package_name for mariadb on redhat

Change-Id: Idacb6827f938bb25b9e7a39a399b40ad27906335

Update neutron to ee10d14987a96fb82cc0905827f7891e8e6ecbb8

ee10d14987a96fb82cc0905827f7891e8e6ecbb8 Try to use zuul-cloner to prepare fixtures

Change-Id: I77ab57aadea3ecdb0d12e1759db7ebe73d4d6a7e

Update nova to 7e60d0b1c20e8fccc105dd7e9239240ec50000ba

7e60d0b1c20e8fccc105dd7e9239240ec50000ba Merge "Put all the logging related parameters to the logging class"
a990dfbba14407900959a602f843f218c4bb013d Merge "Try to use zuul-cloner to prepare fixtures"
7be0693f6eaf304ccabbaf1116033dd4421ed8b4 Merge "Allows the modification of the nova-api ports"
91eca792b56902df1f3271da68dc6857eb615cb3 Try to use zuul-cloner to prepare fixtures
0b7377b891d79499676f6f2c09485fbbc8a4d360 Merge "rename neuton/url_timeout to neutron/timeout"
bea74489ce79e6e81a1d06eaec4d38a169531caf Allows the modification of the nova-api ports
872b17744f3d971bd5bf894eccb8bab41a552448 Put all the logging related parameters to the logging class
a5462fa89fbe7c9b187d116e5fa8d40cdb22f8b8 rename neuton/url_timeout to neutron/timeout

Change-Id: I014c1f10ebd6594f548a1781d8e0de32f1643aea

Update ntp to 9d548a20ba46feb049471140f640daa16d967828

9d548a20ba46feb049471140f640daa16d967828 Merge pull request redhat-openstack#294 from Thubo/master
1fc61aeed4a5626c350a30eebe47cf7ed0f0d0a6 Fix MODULES-1790

Change-Id: If3a185ded435907245ea3f1c872f87a4a33b0b89

Update openstacklib to 57475d93af5895cff49a298838c97b1451b6d1a0

57475d93af5895cff49a298838c97b1451b6d1a0 Merge "Pass necessary options to Apache when using WSGI"
2ff3a400f890223c07ad37076beda761d6b59b79 Pass necessary options to Apache when using WSGI
fcb34662d836d2be92040792b13e13a4fcfb0b12 Try to use zuul-cloner to prepare fixtures
3be98e8c6b54c198c818771f9fbd3b8311753cb1 Fix fact for puppet facter 2.0.1+

Change-Id: Ia850f439d05ef5005980e6e2880504e390b6bd67

Update rabbitmq to b7e3817

b7e3817 Merge pull request #399 from puppetlabs/prep_5.3.1
5316565 Release 5.3.1
00c5bed Merge pull request #398 from hunner/prep_5.3.0
3dd64be Merge pull request #397 from hunner/revert_385
608a64d Prep 5.3.0
1e38254 Revert #385

Change-Id: Ie15749aa05d55a33b691be3bf7f74e3d76815f1a

Update sahara to 1efb8f227352fffe8607ae5caf1b858eda829f2d

1efb8f227352fffe8607ae5caf1b858eda829f2d Merge "Remove deprecated parameters"
254e1e1444e640d2198312ecf25d4a0a80e0cf23 Try to use zuul-cloner to prepare fixtures
2417317d866a2428c8e9bfa1548d60a3d87616fe Remove deprecated parameters

Change-Id: Ia4bed0fd6035c9b36bf1f9516b1f537084a059ea

Update swift to 68eb6373f0805401384afa05d78da587d6d742c8

68eb6373f0805401384afa05d78da587d6d742c8 Try to use zuul-cloner to prepare fixtures

Change-Id: I754f1eab0bf5b7f9a29ede64f858f4f2b9eaa0b8

Update tempest to 09b2b5c70fa3772b33f4bce0ea178a723a820aab

09b2b5c70fa3772b33f4bce0ea178a723a820aab Try to use zuul-cloner to prepare fixtures

Change-Id: I707fd6fd8b25eb915a89f6f72e71cdadd130ac6d

Update trove to 045d929556389a631a34a68b011dc87b960fb9a6

045d929556389a631a34a68b011dc87b960fb9a6 Try to use zuul-cloner to prepare fixtures

Change-Id: I45b578327592e73b5042acba80bb78895dafbe0a

Puppetfile

@@ -1,13 +1,13 @@
 mod 'apache',
-  :commit => '383bca75a7243bf802739fdf8d58dbf585936329',
+  :commit => '22ed02711ea7afee8a17c6b0ab7eb24d772d2b6e',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
   :commit => '9a3b74b0dbb655a3afcbc8bdee442f2143420b72',
   :git => 'https://github.com/aimonb/puppet_aviator.git'
 
 mod 'ceilometer',
-  :commit => '919020ed4c42ef90a7066c9f428dbf1509a7f332',
+  :commit => '60a2c46196d0fdb4675a7482648a85fc928ca0cf',
   :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 => '0724a23b582785a696d2db9f117ad12117bbb350',
+  :commit => '17026a35ecc28e28075bc13580b9740d641094ac',
   :git => 'https://github.com/openstack/puppet-cinder.git'
 
 mod 'common',
@@ -35,35 +35,35 @@ mod 'corosync',
   :git => 'https://github.com/puppetlabs/puppetlabs-corosync.git'
 
 mod 'firewall',
-  :commit => 'f973175bc01e6ab357857efbd611bb34ef1a2e4b',
+  :commit => '6755b959004f176844cb143690cc83ba621c40de',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
 
 mod 'galera',
   :commit => '26016bc260b6d1101201dd1ca791deb1a5fcf2cf',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => '57009efc4a916b01a51ad4815f5ca74c3f094f47',
+  :commit => 'd6ad1f504eda3f1f0e0613ece9392dd8f78bf7b5',
   :git => 'https://github.com/openstack/puppet-glance.git'
 
 mod 'gluster',
   :commit => '23b1055314bb435b4725134a9055c8676ccdfcff',
   :git => 'https://github.com/purpleidea/puppet-gluster.git'
 
 mod 'gnocchi',
-  :commit => '34be2c3ec87cb7250146779d58462b21468c37dc',
+  :commit => '02692807d218210a27a4043e27b3aa0ac38e8b28',
   :git => 'https://github.com/openstack/puppet-gnocchi.git'
 
 mod 'haproxy',
-  :commit => 'ad4fa8dfe69268f6daa1aa532bd8684d6427c991',
+  :commit => 'cdcbc19ac3389aadc5d7ec1e9d0631de28e06bf7',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => 'bc4e8c0d654fccaa69e0b4bb5b7d1462a9085468',
+  :commit => '06953c3d4493e405343704b1beeb1e610cfa75e6',
   :git => 'https://github.com/openstack/puppet-heat.git'
 
 mod 'horizon',
-  :commit => '34d3c0a79af9b1025466eae01ff9c6c042abed6c',
+  :commit => '06e150fa18ff6ebfa00a93553a1576de3ce361f8',
   :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 => '0900e0e10c959273adb4ee83f185696b632d8c82',
+  :commit => '50ec0e11608930f5286ee0913d1cd6fde8bf8a55',
   :git => 'https://github.com/openstack/puppet-ironic.git'
 
 mod 'keepalived',
   :commit => '24d523691b3581d4d0f662ffd10f1458014a9829',
   :git => 'https://github.com/Unyonsys/puppet-module-keepalived.git'
 
 mod 'keystone',
-  :commit => '240301fe01982b1c41839235d3dc19895f682108',
+  :commit => 'cc2f08164aea815c8e6f1a849edfee6aa75f7dcc',
   :git => 'https://github.com/openstack/puppet-keystone.git'
 
 mod 'manila',
-  :commit => '05503844b9495a7142716593454c83f060daed54',
+  :commit => 'd8fee807df66314ee3e5c68ee669e8826e327eef',
   :git => 'https://github.com/openstack/puppet-manila.git'
 
 mod 'memcached',
   :commit => '8e6fdfda7400c40176baa5063e05ff716cc5fd73',
   :git => 'https://github.com/saz/puppet-memcached.git'
 
 mod 'module-collectd',
-  :commit => '5c317c56a86847693c96b120e1be333b53a7c715',
+  :commit => '9d07e5b15d3b6f67dd2899ef08dc7d2c20cff0a4',
   :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 => '2a8693482f962b36024e9c70a459de8e9dc65eb6',
+  :commit => '5e6db0bb0fd8b28bb9c7d8f23e67e6ddb8abf616',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',
@@ -119,27 +119,27 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => '544982049eb8d45c651941876b92079e3e6bd170',
+  :commit => 'ee10d14987a96fb82cc0905827f7891e8e6ecbb8',
   :git => 'https://github.com/openstack/puppet-neutron.git'
 
 mod 'nova',
-  :commit => 'b3aed594249fb5d22cc284291126a0c268e75dec',
+  :commit => '7e60d0b1c20e8fccc105dd7e9239240ec50000ba',
   :git => 'https://github.com/openstack/puppet-nova.git'
 
 mod 'nssdb',
   :commit => '2e163a21fb80d828afede2d4be6214f1171c4887',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',
-  :commit => '1b57d27fb73eca526b559abbfe53dbdc6b15eb5c',
+  :commit => '9d548a20ba46feb049471140f640daa16d967828',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
   :commit => 'e005145df14538c04e07d213b43be50ca2551e8b',
   :git => 'https://github.com/openstack/puppet-openstack_extras.git'
 
 mod 'openstacklib',
-  :commit => '989d8e999a4f17126c37007bab3d71d023ab7d10',
+  :commit => '57475d93af5895cff49a298838c97b1451b6d1a0',
   :git => 'https://github.com/openstack/puppet-openstacklib.git'
 
 mod 'pacemaker',
@@ -155,7 +155,7 @@ mod 'qpid',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => '9a420b32e8a9ef2e4a1b76e405ee22257fc83ffa',
+  :commit => 'b7e381715c599c527183257aa58df9d77bbe81ba',
   :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 => '486368ccff7cbaac7ae3697fa562cccab2afa2ac',
+  :commit => '1efb8f227352fffe8607ae5caf1b858eda829f2d',
   :git => 'https://github.com/openstack/puppet-sahara.git'
 
 mod 'snmp',
@@ -191,15 +191,15 @@ mod 'stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => 'f1f9a24998d0fe2d62ef436bfc60d1ffa194f862',
+  :commit => '68eb6373f0805401384afa05d78da587d6d742c8',
   :git => 'https://github.com/openstack/puppet-swift.git'
 
 mod 'sysctl',
   :commit => 'c4486acc2d66de857dbccd8b4b945ea803226705',
   :git => 'https://github.com/puppetlabs/puppetlabs-sysctl.git'
 
 mod 'tempest',
-  :commit => 'cdb255b14c3f1ab2c486d26bea2bc150f382164d',
+  :commit => '09b2b5c70fa3772b33f4bce0ea178a723a820aab',
   :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 => 'c5b0e46a63125fa7b87b6461ac1dd0de49b8a881',
+  :commit => '045d929556389a631a34a68b011dc87b960fb9a6',
   :git => 'https://github.com/openstack/puppet-trove'
 
 mod 'tuskar',

apache/README.md

@@ -1126,6 +1126,16 @@ Changes your virtual host configuration files' location. Default: determined by
 - **Gentoo**: `/etc/apache2/vhosts.d`
 - **Red Hat**: `/etc/httpd/conf.d`
 
+##### `vhost_include_pattern`
+
+Defines the pattern for files included from the `vhost_dir`. This defaults to '*', also for BC with previous versions of this module.
+
+However, you may want to set this to a value like '[^.#]\*.conf[^~]' to make sure files accidentally created in this directory (from version
+control systems, editor backups or the like) are *not* included in your server configuration.
+
+A value of '*.conf' is what is shipped by some operating systems. Also note that this module will, by default, create config files ending
+in '.conf'.
+
 ##### `user`
 
 Changes the user Apache uses to answer requests. Apache's parent process will continue to be run as root, but child processes will access resources as the user defined by this parameter.
@@ -1513,7 +1523,7 @@ Installs [Apache SSL features][`mod_ssl`] and uses the `ssl.conf.erb` template t
 
 **Parameters within `apache::mod::ssl`**:
 
-- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5'.
+- `ssl_cipher`: Default: 'HIGH:MEDIUM:!aNULL:!MD5:!RC4'.
 - `ssl_compression`: Default: 'false'.
 - `ssl_cryptodevice`: Default: 'builtin'.
 - `ssl_honorcipherorder`: Default: 'On'.

apache/manifests/custom_config.pp

@@ -49,12 +49,13 @@
   }
 
   if $ensure == 'present' and $verify_config {
-    exec { "service notify for ${name}":
+    exec { "syntax verification for ${name}":
       command     => $verify_command,
       subscribe   => File["apache_${name}"],
       refreshonly => true,
       notify      => Class['Apache::Service'],
       before      => Exec["remove ${name} if invalid"],
+      require     => Anchor['::apache::modules_set_up']
     }
 
     exec { "remove ${name} if invalid":

apache/manifests/init.pp

@@ -46,6 +46,7 @@
   $confd_dir              = $::apache::params::confd_dir,
   $vhost_dir              = $::apache::params::vhost_dir,
   $vhost_enable_dir       = $::apache::params::vhost_enable_dir,
+  $vhost_include_pattern  = $::apache::params::vhost_include_pattern,
   $mod_dir                = $::apache::params::mod_dir,
   $mod_enable_dir         = $::apache::params::mod_enable_dir,
   $mpm_module             = $::apache::params::mpm_module,
@@ -380,4 +381,8 @@
       manage_docroot  => $default_ssl_vhost,
     }
   }
+
+  # This anchor can be used as a reference point for things that need to happen *after*
+  # all modules have been put in place.
+  anchor { '::apache::modules_set_up': }
 }

apache/manifests/mod.pp

@@ -162,4 +162,6 @@
       }
     }
   }
+
+  Apache::Mod[$name] -> Anchor['::apache::modules_set_up']
 }

apache/manifests/mod/ssl.pp

@@ -3,7 +3,7 @@
   $ssl_cryptodevice        = 'builtin',
   $ssl_options             = [ 'StdEnvVars' ],
   $ssl_openssl_conf_cmd    = undef,
-  $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5',
+  $ssl_cipher              = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4',
   $ssl_honorcipherorder    = 'On',
   $ssl_protocol            = [ 'all', '-SSLv2', '-SSLv3' ],
   $ssl_pass_phrase_dialog  = 'builtin',

apache/manifests/params.pp

@@ -32,6 +32,8 @@
   # should we use systemd module?
   $use_systemd = true
 
+  $vhost_include_pattern = '*'
+
   if $::operatingsystem == 'Ubuntu' and $::lsbdistrelease == '10.04' {
     $verify_command = '/usr/sbin/apache2ctl -t'
   } else {

apache/spec/defines/custom_config_spec.rb

@@ -26,7 +26,7 @@
         'content' => '# Test',
       }
     end
-    it { is_expected.to contain_exec("service notify for rspec").with({
+    it { is_expected.to contain_exec("syntax verification for rspec").with({
       'refreshonly' => 'true',
       'subscribe'   => 'File[apache_rspec]',
       'command'     => '/usr/sbin/apachectl -t',
@@ -56,7 +56,7 @@
         'verify_command' => '/bin/true',
       }
     end
-    it { is_expected.to contain_exec("service notify for rspec").with({
+    it { is_expected.to contain_exec("syntax verification for rspec").with({
       'command'     => '/bin/true',
     })
     }
@@ -80,7 +80,7 @@
         'verify_config' => false,
       }
     end
-    it { is_expected.to_not contain_exec('service notify for rspec') }
+    it { is_expected.to_not contain_exec('syntax verification for rspec') }
     it { is_expected.to_not contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with({
       'notify' => 'Class[Apache::Service]'
@@ -93,7 +93,7 @@
         'ensure' => 'absent'
       }
     end
-    it { is_expected.to_not contain_exec('service notify for rspec') }
+    it { is_expected.to_not contain_exec('syntax verification for rspec') }
     it { is_expected.to_not contain_exec('remove rspec if invalid') }
     it { is_expected.to contain_file('apache_rspec').with({
       'ensure' => 'absent',

apache/templates/httpd.conf.erb

@@ -85,9 +85,9 @@ Include "<%= @confd_dir %>/*.conf"
 <%- end -%>
 <% if @vhost_load_dir != @confd_dir -%>
 <%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-IncludeOptional "<%= @vhost_load_dir %>/*"
+IncludeOptional "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 <%- else -%>
-Include "<%= @vhost_load_dir %>/*"
+Include "<%= @vhost_load_dir %>/<%= @vhost_include_pattern %>"
 <%- end -%>
 <% end -%>
 

ceilometer/.gitignore

@@ -8,3 +8,4 @@ coverage/
 .idea/
 *.swp
 *.iml
+openstack/

ceilometer/Gemfile

@@ -19,6 +19,7 @@ end
 group :system_tests do
   gem 'beaker-rspec',                 :require => 'false'
   gem 'beaker-puppet_install_helper', :require => 'false'
+  gem 'r10k',                         :require => 'false'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']