Skip to content

Commit

Permalink
Bump all puppet modules to their latest masters
Browse files Browse the repository at this point in the history
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

Update ceph to c60c6209ac799555b94bf62ce1c2cf00084e42d2

c60c6209ac799555b94bf62ce1c2cf00084e42d2 Fix RSpec 3.x syntax
7585a60ec7f9c6cd781068859663f57f9a945f2f Switch to new release key
aa6a46bbdecbf7f887f2464aae165cbd1a8e986a Drop no longer supported releases
398b904eb56611b948cc5aea2a33b3dd538337b7 use full length APT key
008370a86c2f32161473b97dbd51a00c07dbda55 Fix RGW Apache syslog creation
6cb9a00898c86bf32a5706ade64fe3787b0b739b Allow customization of OSDs journal size via class param
f6206a15cc5e52689d20d8b59e7a6bdd9bb9b887 Merge "Fix rgw keystone"
0d7fb171026fa998fbd3c87d3949b2d98863a913 Make args for conf, mons, osds and keys wrappers optional
79fd0d9aebcec4cfac054fb3ed81149a9ed88a53 Merge "osd: fix pattern when matching ${data}"
f65293e56c50c8300e2e975199c988da2a785c95 Merge "Clean the documentation for rspec-beaker"
0c42ba3c817cb97f146e371cf43365c94af1429b Merge "Fix a race condition in mon creation"
a8bccf57dd574e6af677273f10f061cd64e8d7dc Clean the documentation for rspec-beaker
2eb9458fdac9ac03a3474d104450c8634ab285ae Fix rgw keystone
e81e93e45881870b312ae5448e6d39614d7f9640 Fix a race condition in mon creation
10fabadd204587713dbc4ed99d8a57050c6b73fb Enable GPG for EPEL
a58eb25feb60bb1e28cc86cc67236d0c0700135a Merge "define ceph::rgw::keystone."
2ec59f3b8ae4da8f953212091c67ae943861923c osd: fix pattern when matching ${data}
38c4cacd423ece462a1c72837d175aeb8e1f67db Fix the two centos70 nodeset to install correct puppet
498f8e16a32e3c60b050fde6210f0ca3539bf5b3 Add rspec beaker boxes for centos7 and trusy
c1dd900b35d6aee72c6fd32587783b83bf4e6032 define ceph::rgw::keystone.
c58f1e282d2a85d79c221800e88a415eaeaa094a Merge "osd: fix pattern when matching ${data}"
2b0ba61b4697bab2f964321b96afc68340b62636 Bump default release to hammer
b76719ef98cfec1cc17ceec68773d7a7a0079dc7 osd: fix pattern when matching ${data}
71fccdf944a2b0721a972a8a86f97703cabd586e Add EL7 Support, Fix unit and integration tests
a1c1ce2aea987550e54bcb1f3e3a18f428a10506 Fix apt::key location to not contain redirect
a3c12f05d811f5506f69f3060e554c80793dc183 Convert rspec tests to rspec 3.x

Change-Id: If305311600ed3def71df06c32ab46b8672730887

Update concat to c307bee3933d88e6028274b0fa122a9b0c87b1d4

c307bee3933d88e6028274b0fa122a9b0c87b1d4 Merge pull request #366 from thrnio/fix_spec_vagrant
8484bc5072142c9f0cc5a90918e6e43efe4dedf0 Merge pull request #367 from thrnio/allow_integer_owner
a6ebae9857e40e31179659401a64d81d57eac8d9 Allow integer UID/GID for $owner/$group
5efd30a0e193e1b95c3077c9610886df70735769 (MODULES-2572) Fix acceptance test vagrant URLs
fd4f1e2d46a86f1659da420f4ce042882d38e021 Merge pull request #361 from jhoblitt/feature/selinux
60051ae55d1d398f0439ae91e9fdaf0d944789b4 add log/ to .gitignore
ff1e65a901381349e3ed37591605e8baac24be21 (MODULES-2303) add selinux related params to concat type
e250a262a5d8adf01640706d33ef6c8ffcd6a89c Merge pull request #364 from bmjen/fix-frag-backup
ca58571ab2fd3619a9ae516987689d051b3814ff (MODULES-1700) Re-factored original fix, to not default to backing up fragments.
370e38aafe9aa155920a54179edc7384b6621570 Merge pull request #363 from jhoblitt/fix-broken-backup
b6f1ac1d359fdf3e1fe95d411a430c71cb449eb1 (MODULES-1700) remove all reliance on resource defaults
fede2461c1cf82267ba65b7f40b60b9d3e4d5ca1 Never backup fragments, no matter what $backup for concat resource is used
65a7cf29041265ee8bf35edef216cf160189cd9a Merge pull request #360
ac28069b1392938f7ced0f0ff34497bc2b75e716 Merge pull request #358 from buzzdeee/master
d5c305c2bf03912987fe7eba0da31dccadb65805 Recent OpenBSD changed to ruby22 as default interpreter, that now is also used by Puppet, so adapt to that.
b957bb9 Merge pull request #357 from mhaskel/revert-sol12
05426bb Revert "Add support for Solaris 12"
fb022ee Merge pull request #355 from mhaskel/1.2.4-prep
db914f1 1.2.4 prep
89fceb4 Merge pull request #354 from bmjen/merge-master
d336ea0 Merge pull request #352 from mhaskel/pe_next_fixes
c129edf Use AIO ruby if available
c47e72c Merge pull request #351 from hunner/mergeback
afe258a Merge remote-tracking branch 'puppetlabs/1.2.x'
848554e Merge pull request #350 from mhaskel/pe_next_fixes
408633f Missed a typo
e936813 Merge pull request #348 from gwollman/bug/master/FreeBSD-ruby-interpreter
2f82480 Merge pull request #349 from mhaskel/pe_next_fixes
a72be83 Use the correct vardir in the tests
839de04 (#2208) FreeBSD: call /usr/local/bin/ruby explicitly
adb17a4 Merge pull request #344 from drewfisher314/ticket/2135-add-solaris-12
47359c3 Merge pull request #347 from mhaskel/aio_fix
967880f check for nil
b36f071 Merge pull request #346 from mhaskel/aio_fix
f654561 Default test vardir to the aio paths for *nix systems
8618076 Merge pull request #345 from mhaskel/aio_helper
7473415 Add helper to install puppet/pe/puppet-agent
588757d Merge pull request #343 from raphink/fix/is_pe_master
5bc2d58 Add support for Solaris 12
17b836b Compare $::is_pe as bool, not string
35958b3 Merge pull request #339 from hunner/add_helper
130a334 Merge pull request #340 from bmjen/╯°□°╯︵┻━┻
52cb97c Update CHANGELOG with yanked 2.x releases
6ad7f74 Update spec tests for rspec-puppet 2.0
e71af81 (╯°□°)╯︵┻━┻ the 2.0.x rewrite
9dd00aa Add helper to install puppet/pe/puppet-agent
b84f710 Merge pull request #335 from justinstoller/maint/master/set-puppet-version
d39884e (maint) allow setting PUPPET_VERSION in acceptance
171a304 Merge pull request #334 from bmjen/fix-windows
0ea02e4 fixes special characters test to support windows file restrictions
375de4a Merge pull request #333 from puppetlabs/travisci_update
2059f81 Updated travisci file to do testing for Puppet 4
4c13cb0 Merge pull request #332 from bmjen/bug/safe-name-on-windows
4a78188 (MODULES-2094) Extend regexp to remove parenthesis on safe names
724dcaa Merge pull request #330 from duritong/fix_autorequire
09a380c (MODULES-2023) - autorequire the file we are generating
8d7d427 Merge pull request #328 from puppetlabs/2.0.x-to-master
5997e65 Merge pull request #326 from bmjen/refix-lint
a5cce42 fixes bug introduced by a linting fix
6cecf8c Merge pull request #324 from bmjen/1.2.3_prep
75d1e96 Merge pull request #325 from bmjen/2.0.1_prep
d6ee5a8 Release 2.0.1 prep
5267d35 1.2.3 Release prep
6751adb 1.2.3 Release prep
b0c874b Merge pull request #323 from bmjen/update-readme
d4376cb updates init.pp to pass linting
abf40f0 update README with correct behavior for fragment  parameter
1869563 Merge pull request #322 from DavidS/fixup-readme
f1b7a50 Fixup the wording in README
ddcf87f Merge pull request #321 from bmjen/empty-concats
6264171 Merge pull request #319 from bmjen/add-file-autorequire
64b9288 fix defaulted force behavior
773b858 Merge pull request #320 from DavidS/add-warn-warning
b271bff (MODULES-2080) Call out changed behaviour of 'warn' parameter
78fdb4e adds file autorequire
e9ee044 Merge pull request #318 from bmjen/frag-targeting
db33829 fix fragment target handling
02c5f4b Merge pull request #317 from bmjen/tableflip
2292759 fixes dependency bug in creating the target file
f4d4ca0 Add ability to unittest puppet 4
8c4e5fc Merge pull request #316 from bmjen/merge_2.0.x
bb55d80 Merge pull request #314 from bmjen/2.0.0-prep
ca73b72 fix linting
5ab5672 Merge pull request #313 from bmjen/2.0.0-prep
26033e6 2.0.0 release prep
9c5857f 1.2.2 release prep
2d5734c Merge pull request #312 from bmjen/1.2.2-prep
b5f1764 update metadata.json
4ea84be Merge pull request #311 from bmjen/1.2.2-prep
8d04426 1.2.2 release prep
d654dea Merge pull request #310 from puppetlabs/modulesync_updates
4be434d Lint fixes
84ee577 fix Gemfile
754c927 beaker gemfile fixes
16988df sync via modulesync
40cbb29 sync via modulesync
ee3e184 Merge pull request #308 from cyberious/master
0587e37 Merge pull request #309 from justinstoller/maint/master/valid-json
32e417a (maint) fixup invalid JSON
1a2975a (maint) Only add newline if string does not end with newline
f24437c Merge pull request #307 from bmjen/ensure-newline
118e802 readd ensure_newline param and tests for backwards compatibility
b880a99 Merge pull request #306 from bmjen/re-refactor-2.0
6876399 re-refactor of concat to not depend on file_concat
b2c4145 Merge pull request #305 from bmjen/fix-geppeto
1534050 fixes the metadata.json to be geppeto compliant
bcf3af5 Merge pull request #304 from bmjen/update-dep-version
cd21d8b update metadata.json with correct dependencies and setting exact version for file_concat dependency
253f497 Merge pull request #303 from bmjen/modules-1933
0459eba MODULES-1933: fixes backup passing in fragments without concat resource
562977a Merge pull request redhat-openstack#299 from psoloway/readme
6aebeea Merge pull request #302 from bmjen/cuz-strict-variables
ef4aac8 fix for strict variables checking
2d64759 Update README per cd03959
16104d0 Merge pull request #300 from IceBear2k/master
e562bcd Revert and fix regex
30cb251 Merge pull request redhat-openstack#298 from bmjen/fix-windows-acceptance
3809409 fixes acceptance tests on windows
583c528 Merge pull request redhat-openstack#296 from bmjen/fix-windows
6cfa62b fixes windows.
e2b189e Merge pull request redhat-openstack#297 from bmjen/o_____p
cd03959 re-add removed params for backwards compatibility
ea5af52 Merge pull request redhat-openstack#295 from hunner/fix_metadata
2ccde9d Merge pull request redhat-openstack#294 from bmjen/geppetto-fix
c96ae6a The jenkins geppetto plugin is still complaining
4e61c33 more geppetto lint fixes
f23bd17 Merge pull request redhat-openstack#293 from bmjen/geppetto-fix
71c815b fix linting errors
5059019 Merge pull request redhat-openstack#291 from psoloway/readme
9970cc6 Merge pull request redhat-openstack#290 from bmjen/refactor-native
ececd06 Merge pull request redhat-openstack#292 from bmjen/release-prep-1.2.1
8198296 Updates CHANGELOG and metadata for 1.2.1 release
51bd49f refactor concat to wrap electrical/file_concat
d45e281 Updates README per 936dc29
15ecb98 Merge pull request redhat-openstack#288 from woneill/ticket/MODULES-1700-backup_files_for_static_compiler
aa133e2 Override File default with backup value instead of assuming 'false'
e34eac0 (MODULES-1700) Change the filebucketing behavior so static_compiler can handle them
a0942af Merge pull request redhat-openstack#284 from buzzdeee/master
6f88096 Merge pull request redhat-openstack#287 from j-vizcaino/feature/setup-user-group-explicitly
936dc29 Merge pull request redhat-openstack#289 from puppetlabs/1.2.x
c2d056b spec/setup: Fix indent
e811550 setup: update tests to check for proper user/group ownership
0193fd2 setup: set user/group explicitly for dirs & script
b20d8b9 Fix breakage on OpenBSD in similar fashion as it is done for Windows. Broken since the switch from the shell script to the ruby script.
710b3d5 Merge pull request redhat-openstack#268 from mhaskel/1.2.0-prep
7f97a0e 1.2.0 prep

Change-Id: I01b7a6e43d8db5dd295ee610fc019175a6fa406c

Update corosync to f0408cd231caa7009aa187112022a62ebb3b8925

f0408cd231caa7009aa187112022a62ebb3b8925 Merge pull request redhat-openstack#164 from pulecp/master
83c8891c712e57918f4e1981c418ea66dc6a8a00 manage package and version for pcs
f925b0b91c1cfca19df06c940fd0084bc40f9f89 Merge pull request redhat-openstack#160 from roidelapluie/troll
7a90137c9f321097d6e99b0c544f1b2aa9720a03 Stop trolling in README :-)
5d810eb2cdf0fc3068277776db3c5ba30a4175b4 Merge pull request redhat-openstack#159 from roidelapluie/p4
635b13390ddb006e0d0e2b2e7b41ea5d2a72d9f7 Use Puppet::Type.newtype instead of Puppet.newtype
5dbca9a58a4e6e43541cf2d5c435576a6944abbb Merge pull request redhat-openstack#138 from tdb/suidmanagerfix
c31cab2c044c9015ba63d9ba73997b5a2c61a089 Merge pull request redhat-openstack#158 from cmurphy/acceptance
dbe8c11125f232a66835c07976b2e2772c974ad2 Merge pull request redhat-openstack#155 from mkrakowitzer/cs_colocation_crm_spec
8e94ed014a7d81ee67b96b9d1155d9a6eebeea7e Fix acceptance tests for RHEL6 and Ubuntu 14.04
119b1c3e561cc37b67a08cd764ec3eddd2590707 Merge pull request redhat-openstack#140 from nibalizer/update_dotfiles
efb922e3ef8db3897f18575961f33430208a3867 Add spec test for cs_colocation crm provider
9c6bbc1ed0bf6b6dd400dc017ccdbe99763d27f6 Set up PC dotfiles, modify readme
5b72ac774958324ddfb9277859ef44a36508b2fe Merge pull request redhat-openstack#137 from nibalizer/update_json
98b65fe5a79ad68e38717ccd4e03f4c840adbf4d Merge pull request redhat-openstack#141 from syseleven/implement-version
011da2b574034ea3880b85ebd50dda067911b5fa Made pacemaker and corosync version configurable
ca5be8d5ce8eb05b96fdb323e44331911ec1f233 Update metadata.json
caae757b42bc21bd34fb7eb6a0371f9fff559a14 Fix deprecation warning for SUIDManager.

Change-Id: Icb8efe79c2d5aa2af16d0d3283ba27013f879f4e

Update snmp to 90254293f6bf097eca7096562ac63f31a0bc75f4

90254293f6bf097eca7096562ac63f31a0bc75f4 Merge branch 'release/3.4.0'
c2f44baeb8c61908264252ef1d309ef28028a70a Update versions for 3.4.0 release.
7d4fc4b78c1e8cabc864ef5506f2633eb4e309da Add a pause after service stop and before creating SNMPv3 users.
bbb4f24e5b9dc54c8cee51ca6a48e4aac84bbe42 Merge branch 'feature/README.markdown' into develop
0ed3e5b82d18a177ec0a371ce90d2f9f16e5e4ee Add links in the reference section of the README.
b3765be33c5d454f962a8c4180412fab3d24e844 Better define Access Control variables in README.
03070c2568f73d8b58c88712d631a09ee98a19f6 Shorten metadata.json summary to 144 characters.
dca58e8e2cc077c9a2680e7b944df4515f0b69dc Improvements to README.markdown.
f455ffe9922a918af23f594d5a03631aeff32e3a Added Access Control section to README.markdown.
4789e77ddbade72df041149a6ad61dd540600f8b Convert to new README.markdown format.
7db30c9b1077e74135ca64863faa9feedda99c7e Fix rwcommmunity6 typo.
7174e9fa5f507f9ac84068bbad34ebb4517edd15 Merge branch 'typo101-typo101-config-dir-patch' into develop
03671e90a42a137cd0086e71faa771d7d4275cc3 fix typo in freebsd config dir perms and ownership
a55bf2d7dff29f945c238f6b592e4ca5c66de9ce Now supporting Puppet 4.
d443402d0bf02205e5a6685b0d6ce6830f0d2e45 Unit test against Puppet 4 via modulesync.
d290b968dde6d37457b81236df7cd39ae6e043de Update Geppetto .project.
e785845b51d62abf2e8ea739cf4ca5401cc84205 Update Puppet 4 gem and support puppet_blacksmith with modulesync.
7a6766403f498d6cb855e6749eae11b4b28d10df Merge branch 'feature/future_parser' into develop
adccc35c7af886ec5c168e33668f075efde006fb Fix lint: variable assigned to the empty string.
f0e5ad7b63b4d91650435451110aa804b4534012 Fix lint: class included by relative name.
49ad65ebf9344549dd6cbf888fd373dd0be24db7 Get code ready for Puppet 4.
e497692a9629aa014a61442f4e8760826f837b30 Merge branch 'feature/el7' into develop
600a538a1a4a5b3148b1c47a6f1de212d470c9d2 fixed a small typo in example
4510ffd4a805bf69a5e3dacee76df8d40466a1af Add rspec tests specifically for EL5.
302405fdcf0b7665730c5f31d7510bb39316b12c Set EL7 options to work with systemd.
f3dfad58d1c7bbff69218a93da311d04c9ab77c8 Merge branch 'develop' of github.com:razorsedge/puppet-snmp into develop
dc40611b99952ae377954897fb05a04810128f77 Merge pull request redhat-openstack#41 from bdellegrazie/handle_empty_rocommunity
39beba465a1a1b496142f76caaa40ca52577262f skip zero length strings in ERB template output
fc404e6abbe9230cd9ddc88f918f665ee15479ae Shorten metadata summary to less than 144 characters.
520cc9ffd461c663b5bdb26069801aea88ec4f2f Stick with rspec 2 for unit tests.
991e4a719e9413e01d288a3ea98531e28809b535 Fix puppetlint rake task with modulesync.
7d90a6e77cced0d850bf92b19482590ea4951a68 'subject' method no longer exists in rspec-puppet.
2fb0218f40433f323cf7fa523c25be73c1e14214 Update rspec-puppet ~> 2.0 and metadata-json-lint >= 0.0.4 with modulesync.
a3b9489717935b85a4c198e79107c124538de3fd Merge branch 'release/3.3.1' into develop

Change-Id: I0d39500d267f0ebe5ba23e67d80564f39243e88c

Update stdlib to 4e62223

4e62223 Merge pull request #535 from martinpfeifer/package_provider_fact
d73fd3c prevent deprecation warning about the allow_virtual parameter

Change-Id: I7e491a8f985c8ed6f14b74cd8360df71c1d3de5c

Update tuskar to 52120a9c64eb411c1ef51dccfc6f758f7142f6a5

52120a9c64eb411c1ef51dccfc6f758f7142f6a5 Merge "Put all the logging related parameters to the logging class"
79cb000d2267a0102bf2f6076f9988625923c5bf Try to use zuul-cloner to prepare fixtures
c4efae01d724d06fb71d26c827e9610d4f63ed2d Put all the logging related parameters to the logging class
e7799ac9512891dd2a2aace23909bfa3624e5384 Merge "Initial msync run for all Puppet OpenStack modules"
83692c25e27e4138ba33fd2ecfea4bdfdd6dab44 Reflect provider change in puppet-openstacklib
d713405828e91b95cca79f71b63e711c7a4157a7 Initial msync run for all Puppet OpenStack modules
e5828de78b90e7a5a1378cd94082d661b770173f Rely on autorequire for config resource ordering
dd80631f4b8558d465b84b6742b7d282b921f5f1 Use openstack/ namespace for fixtures modules

Change-Id: Ice11a554b662c5df3fbbdfb2422b06aa3f710c57
  • Loading branch information
xbezdick committed Oct 13, 2015
1 parent ce5b444 commit e419d47
Show file tree
Hide file tree
Showing 400 changed files with 11,871 additions and 5,436 deletions.
58 changes: 29 additions & 29 deletions Puppetfile
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
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',
:commit => 'b6ab15b47c81d7694fdcfd75d8f2e0a0481ca40c',
:commit => 'c60c6209ac799555b94bf62ce1c2cf00084e42d2',
:git => 'https://github.com/stackforge/puppet-ceph.git'

mod 'certmonger',
:commit => '3f86b9973fc30c14a066b0f215023d5f1398b874',
:git => 'https://github.com/rcritten/puppet-certmonger.git'

mod 'cinder',
:commit => '0724a23b582785a696d2db9f117ad12117bbb350',
:commit => '17026a35ecc28e28075bc13580b9740d641094ac',
:git => 'https://github.com/openstack/puppet-cinder.git'

mod 'common',
:commit => '4c97587bf49d04106444bc6d57a1262d7aca1393',
:git => 'https://github.com/purpleidea/puppet-common.git'

mod 'concat',
:commit => '52d0f1d6809c9f1d8453f9e3ca10d792e67acc89',
:commit => 'c307bee3933d88e6028274b0fa122a9b0c87b1d4',
:git => 'https://github.com/puppetlabs/puppetlabs-concat.git'

mod 'corosync',
:commit => '8d725aea7a9d91d861929851a9da8da1e3519b21',
:commit => 'f0408cd231caa7009aa187112022a62ebb3b8925',
: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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -171,11 +171,11 @@ 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',
:commit => '64f1a6976830bb4e96176a7296e8d14f65df0cac',
:commit => '90254293f6bf097eca7096562ac63f31a0bc75f4',
:git => 'https://github.com/razorsedge/puppet-snmp.git'

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

mod 'stdlib',
:commit => 'e1a9bf506359d1e84d13b857ca6fa5e556ceeddd',
:commit => '4e62223801d118bb427a230b4571a911399ea859',
: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',
Expand All @@ -211,11 +211,11 @@ 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',
:commit => 'b2875e2d673f4a595f3991eac44689b5f8e4c9c6',
:commit => '52120a9c64eb411c1ef51dccfc6f758f7142f6a5',
:git => 'https://github.com/openstack/puppet-tuskar.git'

mod 'vcsrepo',
Expand Down
12 changes: 11 additions & 1 deletion apache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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'.
Expand Down
3 changes: 2 additions & 1 deletion apache/manifests/custom_config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
5 changes: 5 additions & 0 deletions apache/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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': }
}
2 changes: 2 additions & 0 deletions apache/manifests/mod.pp
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,6 @@
}
}
}

Apache::Mod[$name] -> Anchor['::apache::modules_set_up']
}
2 changes: 1 addition & 1 deletion apache/manifests/mod/ssl.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions apache/manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions apache/spec/defines/custom_config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
})
}
Expand All @@ -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]'
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions apache/templates/httpd.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>

Expand Down
15 changes: 0 additions & 15 deletions ceilometer/.fixtures.yml

This file was deleted.

1 change: 1 addition & 0 deletions ceilometer/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ coverage/
.idea/
*.swp
*.iml
openstack/
1 change: 1 addition & 0 deletions ceilometer/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
Loading

0 comments on commit e419d47

Please sign in to comment.