Skip to content

Commit

Permalink
Update apache to de1bee73d362a1a952136077ff400a15550b3d8d
Browse files Browse the repository at this point in the history 
de1bee73d362a1a952136077ff400a15550b3d8d Merge pull request #1359 from hunner/fix_passenger_spec
8871f0be57b66d3b4259efa2bb00b3eec11e0e35 Disable passenger tests other than vhost
c9b73f0bec2a3e3d05034df3c95e76bfff1c49e8 Merge pull request #1340 from SlavaValAl/master
d8c59a4d53a247653b193a53e8d8c8b8973327a2 Merge pull request #1339 from timogoebel/feature_root_directory_options
a85588aa66dbd9c83f3cb0434bc99256618728f3 add parameter root_directory_options
7e57138aa9a27ffbd07069243efffaa39a7a865c Merge pull request #1355 from BigAl/MODULES-3017
c1e70c9e589e600fb4914ab21a8d82f6c3e88010 Merge pull request #1338 from timogoebel/feature_more_file_mode
5a1fdd32b14b630a98fe9d48d128c463d1b437e3 Merge pull request #1347 from jyaworski/add_apache_version_fact
595a55ccaaf64c603b4f951059fae59d4eca0797 Merge pull request #1356 from hunner/fix_pagespeed_spec
fe1dae9f59c756b86d05dd4e3e921b2838031e6d Need to know where mod_dir is
b1f60c7c4297de78350a10cbede8ed1149df0fdd allow status code on redirect match to be optional and not a requirement   as per apache documentation   http://httpd.apache.org/docs/2.2/mod/mod_alias.html#redirectmatch
c1ba7e6b813d072f54cc45a7e28bc8f3e7bc1746 Merge pull request #1354 from hunner/fix_passenger
9996cb23a118ee14806197a8597be1c0cbe2e70b Fix passenger on redhat systems
5150b35c48d888c95504bbc91242163354a0f8e2 Merge pull request #1296 from whotwagner/master
4c4ddaa6ef352ed85b592c0913a5331315817e67 Merge pull request #1350 from rvincentatprokarmadotcom/master
2f78dab061378ed6e0e5b7c6aa670dd2625dea14 Bugfix: require concat, not file
f077061b72515a9b336604f22ef7af1801fb2dd5 Merge pull request #1352 from tphoney/ldap_parameters
ed74be3277eac484254e0bb887c736b35c14389e adding docs and tests for ldap parameter additions
9fa1dd71aef812bde52337ea6a4b589d53ca10f1 Added support cache related options to apache::mod::ldap
3d34f69f60ef39555a990efe2ca0881d8b3dfc7a Merge pull request #1351 from tphoney/threadlimit-order
f0a9223d6c906f23da217099e20515c13d9ccb31 Merge pull request #1322 from BigAl/bug/MODULES-2958
a91d9d7293c0cb26b9bf7b1344ced6fb3dfadcd4 ThreadLimit needs to be above MaxClients or it is ignored. https://bz.apache.org/bugzilla/show_bug.cgi?id=46113
5e431279017e900966fc843d75a97c943448d016 Add apache_version fact
081bdc449f992114598bb0ca3f7a331f1f5cd114 Merge pull request #1344 from fbarbeira/patch-1
44f5231c184934e61e56854438e9413b354b2ac8 Merge pull request #1343 from DavidS/fm-4049-update-msync
c748b4502da5534e0ffafd24e5b688e2c1585cd8 (FM-4049) Update to current msync configs [2c99161]
5532bd08e9d71f56c65701c8134a726db48751a6 Remove white space.
2c54785de4f76ed431eaa2d1060458408f62f6b3 Specify owning permissions for logroot directory
95694e6ef16f899caa308bb0c7e4a6cd65e775c0 Merge pull request #1337 from derdanne/gentoo-fix-modules
fc3bea1dace807b786c437edcd5311c8d3a3a19a add file_mode to mod manifests
2c6a22a19777990d7e55e7ae7c70c10273804b16 Merge pull request #1333 from timogoebel/filemode
2c67206b2a1b212dff468dfc54ba49c76cd545a2 Merge pull request #1335 from timogoebel/fix_wildcard_ip
f2fc48e15159ea30626c4816cb5233b28a6066c5 Merge pull request #1336 from tphoney/fm-3801
6d4fcd8160d315a02a4e1fe441e550710f9b7e40 work around pup_5016, debian8 2015.2 service fault
dbfc3844541b745cef87251a32db94ab6178bd1a update module handling for gentoo when used apache 2.4 add module authnz_external as external package in gentoo
7b17dad57ee5cc2aec51d553950cc093eefcaf06 fix vhosts listen to wildcard ip
0f01b59c8ccb303b78ac1cd433d6144f844d6daf add paramter to set config file permissions
ac31d2ec0fcaf2e962cc3d5b0590b512d69744d8 MODULES-2958 : correct CustomLog syslog entry
1dfc02d9036e501570aebabc8d02945073e33a6d 	Added support for modsecurity parameter SecPcreMatchLimit and SecPcreMatchLimitRecursion

Change-Id: Ic0a5cabbddd05772bf35c5db253573696ecc1ab2

Update ceph to 185f76380b57d7c420729be10bf70ef3a3c046ae

185f76380b57d7c420729be10bf70ef3a3c046ae mon: fix service provider for redhat systems

Change-Id: I3a60e1bdaf66d3adc9b8cecdfe69bad3626ff58f

Update contrail to 95616bdf12d90012034b484149d731b5c690da96

95616bdf12d90012034b484149d731b5c690da96 Merge branch 'IPnett-manage_named_conf'
acbe7ba0f678c932cc451c41265ce30dbdc4ee35 Merge branch 'manage_named_conf' of https://github.com/IPnett/puppet-contrail into IPnett-manage_named_conf
a0506ddaa0095445d305e29bcbaf9a831ff13681 Merge branch 'nhicher-allow_user_to_set_kmod_path'
c843dbbe645a9b4ecc89a3898c33c75f51cec512 Allow user to set kmod path
41813eea424439dea0d73ee5535cd5244c01f3f9 do not manage named_conf by default as contrail-dns insists on rewriting the file at every time, resulting in a food fight with puppet

Change-Id: Ie921c76c5af96fea6c029b1c0e29eccfcce3001a

Update elasticsearch to da7b6a59fb8aca125499735ed53edb5fcfab3cbc

da7b6a59fb8aca125499735ed53edb5fcfab3cbc Merge pull request #579 from electrical/integration_fixing
e5edaa82dab6fc1c9f83083644c7315043bf44ab Switch back to use community plugin
03b97697e9339e4472295ceaa1e714798fdeac67 Merge pull request #578 from electrical/fix_integration
efff777486afb8386afcf3f1dd8bd02e1cb6edf9 Fix unit test
df2614015915adf13134128a531af5e559b62187 Fix integration testing
d13b78f24366f7907131789f7cf0ff75d2eed696 Merge pull request #574 from electrical/plugin_source
cbbbdbd7ae9682e1b64931ef6354c417c93ea208 Add before relation to the source file
ff3ccb4e91b2411de91550172801bb1c26231eaf Merge pull request #569 from electrical/plugin_batch
1dcdb39d2c9c28c66d4e0943489edd9713d13327 Add batch flag and install_options param to plugin
dbb6c52c4ecc2d3a174ed5b55c0805ffb9c04121 Merge pull request #566 from electrical/logdir
44c099e3905ee6a487b739b2a6ddf24a0b9ece3e Add support for custom log directory
5ef100dda47bce591b5847ece72f00be1dc913ad Merge pull request #491 from buzzdeee/OpenBSD
8dcc61d5e9ac1ac464e9e31ec8dff828e892b0b8 Merge pull request #564 from electrical/package_upgrade
2890d762a3951faabe8d001c6ac7a4f4242c0ec6 Ensure we notify the services if we upgrade the package
6974f8664ab0cbfcedd9f67f5911a5dcb203d686 Merge pull request #563 from electrical/remove_plugin_dir
902ed0586ee236b9e688204563d7cc1b6185cdc4 Remove plugin dir when the package changes
cc1e6b961047ba899f153abe30bdef8d8b2d2f6d pass plugindir parameter value from the main elasticsearch class down to the native plugins type. That's necessary for installations in non-default locations.
a2888ffc43e8a8a2f43df0c50da8043cad024f3c Some changes to support OpenBSD:
e36fc4a437b302b1bd91e4923b3ffb95fd0562e8 Merge pull request #560 from electrical/release/0.10.2
4691ec2d50698529642a6472a8c5f20339e82261 Update for release
0a66ed4a351eeebc84595eabd0db85ae4a69113a Merge pull request #559 from derdanne/master
b6844797223c11f4211b182a9be13036f2e83996 add Gentoo support

Change-Id: I4abe7bc9eb365d81ef493ba9c53a5dc622268933

Update fluentd to bbbf775ffc112b11035cb1334a4ebfd2e97caa84

bbbf775ffc112b11035cb1334a4ebfd2e97caa84 Add CentOS 6 support to the module metadata
75486c3350d13cc04ceb956ef9b8b1fc917a608c Increment version
82f71961c51276f3ce913c84ba034d58cb6e0ea2 Update summary
bcfaa87ecb867cff18e21dce607ffa78a412f29d Update README
31a87e2c30eb144d0958be2a061c61742bf95181 Add CentOS 6 to the travis build matrix
4e916c99e05bb9a74ef4fdfa36c2fa5a12a22250 Merge pull request #3 from soylent/feature/centos-6
81759fa4975d4bf7598318c712ac3488c8a18ac8 Support CentOS 6.x
b6f5cd48b35a0b5a609a03ea1163cbe3c7bad6e2 Update tdagent.rb
fd64c0fdd9f8a610f312f286fd93318939981b76 Backward compatibilty patch for ruby 1.8.7
d846d922c49e9b7d3d8fadf89b9f9bff9cbed5a8 Use travis to run the both unit and acceptance tests
bb3cc5880ddf17abd268eda5234724fa6c0d1b92 Increment the module version
f51af7115e26c10b25d30d3a89ee7f8f5543da19 Fix the issue with td-agent service being enabled on each run on EL7
29298fd4ed7effff3ea244bed19d4d6b0762e8c5 Add build status icon to the README
0e001fdbed9fb8a7e51e01e4952299479f04a436 Fix travis build configuration
8a13ad2473888936f9a65ea8e1652fb88a48600d Update CHANGELOG
220eb62fec00d25e6d1416393336fcffb729a0c1 Run acceptance tests in docker containers
91039c681fd3125b0ea7072ea4b6ff37efc0b3f6 Update CHANGELOG
f3bacf95e63f63a135fa0df1f62437f0b676a470 Fix formatting
d08a0ea802651667007a96b0f4e7f37c6a01d11a Update README
b2cce97e5ed91a70c51db7e7c0a6d69cc623648f Purge unmanaged config files
9f56948f9bdc4e00aa0a4967a8d21d09ebacb389 Update README

Change-Id: I34a967573bc9182a2884c3ee2bb24930ec6e55de

Update mongodb to e5f62b3fd2f54f73d6a002e7ccec21d4136c3606

e5f62b3fd2f54f73d6a002e7ccec21d4136c3606 Merge pull request redhat-openstack#259 from DavidS/fm-4049-update-msync
d566e9723d3200d966bc201ca8313f91e70edd91 (FM-4049) Update to current msync configs [2c99161]

Change-Id: Ic7834b6adbcd69fb686e40be5f07ab3af51abe98

Update mysql to 6598be8eed273201a87f9dfb37193c0ebd81c89f

6598be8eed273201a87f9dfb37193c0ebd81c89f Merge pull request #796 from jhriggs/ticket/3028-fix_grants_with_ANSI_QUOTES
31c17b04840e87602b944631b1c8b3fdbccd9725 (#3028) Fix mysql_grant with MySQL ANSI_QUOTES mode
aa29170f5bc1de679a5ff886ce7bdd43f45fd105 Merge pull request #795 from DavidS/fm-4049-update-msync
7889a85d37bced0aeb5055e3c93fd57a111e35a7 (FM-4049) Update to current msync configs [2c99161]

Change-Id: Ia3220a83e0bdd1af7b043ad76e2499795320dc40

Update n1k_vsm to 91772fa53dd3ed2686d2e8b0303c77ea6faefe68

91772fa53dd3ed2686d2e8b0303c77ea6faefe68 Merge "Update .gitreview for new namespace"
6fd439cdaed2a280f70931baba5707cccc696636 Update .gitreview for new namespace

Change-Id: Ifd9be2c63f207c6e0cae180ac3a8a84b13619b9d

Update opendaylight to bdd2a70d305c29a1ab9db03d10debe179cb84003

bdd2a70d305c29a1ab9db03d10debe179cb84003 Move from template to file_line for Karaf features
c74614b050587b26f6868c780b431aa9848116f0 Add start of line to log level config check regex
ed49501a3474afd56685f4bada09f86aea39e182 Update enable_l3 param to also accept booleans
58c5416883bc2f0f51deab5d06ee50d56cfbd52d Add basic cfg file checks to Beaker generic tests
a2dbe0504a31af442237bb05be58ed63eedebaa6 Add port tests to supported OS rspec-puppet tests
2119e9b190f0832f1902c51679b24bcf1d455810 Add docs for ODL OVSDB enable/disable L3 param
4cc6ba0a78a71999a379da55f707e0d06050c714 Add Beaker tests for enable_l3 param
1354cd8308210eefb8551ced8c15e02008c6ebfe Add rspec-puppet tests for enable_l3 flag
d88045ff2f7d59336f18d5883e0404d9a77c6fed Add docs for log level param
5b0c75286b2784d1aa1a1bac99d2affdf29a3dcf Add Beaker tests for log level param
7efa464e7c5ff660e40073bde287539055a69196 Update vagrant-odl box list in README
53bc9a8317ce84c71ee31298f83e55927e9e3a73 Add rspec-puppet tests for log level param
5b30fa2e87f4eb82e7f4da00c9df07e3d9379ea5 Update OS distro/version support
7f21f93aa2b49ad43b3218db5a8a9d96410c8d36 Add CentOS 7 Vagrant box config'd for testing
6c1cca8114e418317cd34b129d28b4d17a708d76 Add param to configure ODL logger levels
b9ff109375081ee87486381c5ca37b820d4272e3 Update ODL to Beryllium ERP RC1
d3eae1932bc7818e802c6a74f528f6415737e2b4 Update ODL to Beryllium ERP 201601200134

Change-Id: I6f79fffb2e7a79f1d723e11c423ebd64ac0d85d1

Update pacemaker to 973d35a918cf6051a917e96165eaae6dbed6690a

973d35a918cf6051a917e96165eaae6dbed6690a Merge pull request redhat-openstack#71 from mbaldessari/property_suport
f4b87d118582fe2338ad83d91ea1d6343360afe6 Initial pcs property support

Change-Id: If05a3c17eccaf3e32e38804c4481e5160b435893

Update rabbitmq to 1c635016237f16f99245f904885d534e17521842

1c635016237f16f99245f904885d534e17521842 Merge pull request #427 from DavidS/fm-4049-update-msync
5d7b2b0e7c6607bb65954b1a589fa59659ac042b (FM-4049) Update to current msync configs [2c99161]
dc0964da2399da6a4a2654419b8479257e59d76a Merge pull request #407 from bogdando/fix_MODULES-2754
8f75ff5cfea7945a0d6a4074184a7279a81349d4 Add the config_management_variables param
888a4e9d87e2f3376b7099213002879c98c10dec Merge pull request #424 from firefly4268/MODULE2940-addition_auth_backends_variable
d10bcfef1412aec9d8e9d87beea86bf4b2a00051 Merge pull request #426 from bmjen/mnesia_base
d3bb807c19f3831e6237065258abade9989067d8 Addition of auth_backends array and tests.
c4ed9c3cef840aeabc5fc6f1f2768c26c5bd4e8f Updates install.pp to ensure that mnesia_base directory exists.

Change-Id: I0a434166989a2fcdc3725fe9b99a99c83ee53e6b

Update sensu to 8f4fc5780071c4895dec559eafc6030511b0caaa

8f4fc5780071c4895dec559eafc6030511b0caaa Merge pull request #462 from jcochard/master
f355a8ab8d14429b396756cb30e8cf55a1a6542d Merge pull request #466 from jaxxstorm/redaction_support
77e0d22e4ff38a3915f1f67664a3e85c4c7190dd Merge pull request #468 from EslamElHusseiny/create_resources_defaults
013a8acfb35af57c0b3e8de7fc0de49350904c3c add defaults for create_resources() add defaults for create_resources() of handlers, checks edit README.md with usage of handlers, and checks defaults
3e39df495e78c3e3d17d5616123f1274899afce5 Merge pull request #467 from EslamElHusseiny/mutators
c23c7646536d2aded141674a63d13eef74f90cce add create_resources() for mutators the same way for handlers, checks
1bd841e1d6b420b9ae9eb06cd3fa858720555800 Redact should be an empty array by default
4f9e9ee1765f859a18b840f1375d909aa257e905 Adding readme for redaction
37054b47d8002353f4557abf2350b7534b4e6b0c Adding support for redaction
87cc758c5282448d9cd11175bf48b97bc826e085 support purging with enterprise version

Change-Id: I8ed85aac66a88ce82db00975e2945edbbddb354c

Update uchiwa to c1f9e42d4d15bb51a2ecc02f20fe49d40b8bf7af

c1f9e42d4d15bb51a2ecc02f20fe49d40b8bf7af Merge pull request redhat-openstack#66 from Yelp/multiple_backends
eb986305719ba6a57b6b39dc0b5b418cc56f69e9 Update docstrings to reflect host array option
486e0ff666af2464bd1b5c028f2fc05ebe058846 Undo Gemfile.lock changes
e90222e999a38e244f8e996aa53dcad00fb26755 Allow multiple backends

Change-Id: I448182f2b8bd721d17fa79dda1aeb3624a88b325
  • Loading branch information
@jguiditta
jguiditta committed Feb 5, 2016
1 parent e9043bc commit aa79f84
Show file tree
Hide file tree
Showing 195 changed files with 3,029 additions and 913 deletions.
26 changes: 13 additions & 13 deletions Puppetfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mod 'aodh',
:git => 'https://github.com/openstack/puppet-aodh.git'

mod 'apache',
:commit => '5a277163de3807235f7f2fb4b11ec3d1f0b2d05f',
:commit => 'de1bee73d362a1a952136077ff400a15550b3d8d',
:git => 'https://github.com/puppetlabs/puppetlabs-apache.git'

mod 'cassandra',
Expand All @@ -15,7 +15,7 @@ mod 'ceilometer',
:git => 'https://github.com/openstack/puppet-ceilometer.git'

mod 'ceph',
:commit => '45c81859a5ff37c6cbbce0d260801e9f25354515',
:commit => '185f76380b57d7c420729be10bf70ef3a3c046ae',
:git => 'https://github.com/stackforge/puppet-ceph.git'

mod 'certmonger',
Expand All @@ -35,7 +35,7 @@ mod 'concat',
:git => 'https://github.com/puppetlabs/puppetlabs-concat.git'

mod 'contrail',
:commit => '83471677d5b7b7a1e26c7ccb20f5ab355f41efae',
:commit => '95616bdf12d90012034b484149d731b5c690da96',
:git => 'https://github.com/redhat-cip/puppet-contrail.git'

mod 'corosync',
Expand All @@ -47,15 +47,15 @@ mod 'datacat',
:git => 'http://github.com/richardc/puppet-datacat'

mod 'elasticsearch',
:commit => 'dbceae869eef2dde4ff3ad5504ec002bb4a98c3c',
:commit => 'da7b6a59fb8aca125499735ed53edb5fcfab3cbc',
:git => 'https://github.com/elastic/puppet-elasticsearch.git'

mod 'firewall',
:commit => '9df7e883be758f8f340c720ef7d7022f10c4d842',
:git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'

mod 'fluentd',
:commit => 'ddc5f0e4c6c53d15f0cbd34f74bfaa91a0fb299f',
:commit => 'bbbf775ffc112b11035cb1334a4ebfd2e97caa84',
:git => 'https://github.com/soylent/konstantin-fluentd.git'

mod 'git',
Expand Down Expand Up @@ -139,15 +139,15 @@ mod 'module-data',
:git => 'https://github.com/ripienaar/puppet-module-data.git'

mod 'mongodb',
:commit => 'b25bdb3ce7dcb3e60a4427806fe72cc93625de13',
:commit => 'e5f62b3fd2f54f73d6a002e7ccec21d4136c3606',
:git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'

mod 'mysql',
:commit => 'bc1c44afa4b2e2075aa5992d1528d840bf554a34',
:commit => '6598be8eed273201a87f9dfb37193c0ebd81c89f',
:git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'

mod 'n1k_vsm',
:commit => '3ee42190ffb1cc7df53a2a61c453601a52a349bb',
:commit => '91772fa53dd3ed2686d2e8b0303c77ea6faefe68',
:git => 'https://github.com/stackforge/puppet-n1k-vsm.git'

mod 'nagios',
Expand All @@ -171,7 +171,7 @@ mod 'ntp',
:git => 'https://github.com/puppetlabs/puppetlabs-ntp'

mod 'opendaylight',
:commit => 'bb401b1349363c75310d102d1de49f66f3003a31',
:commit => 'bdd2a70d305c29a1ab9db03d10debe179cb84003',
:git => 'https://github.com/dfarrell07/puppet-opendaylight.git'

mod 'openstack_extras',
Expand All @@ -183,7 +183,7 @@ mod 'openstacklib',
:git => 'https://github.com/openstack/puppet-openstacklib.git'

mod 'pacemaker',
:commit => '00d99b66931d520af202b94d0a2fe3b43f11d8ee',
:commit => '973d35a918cf6051a917e96165eaae6dbed6690a',
:git => 'https://github.com/redhat-openstack/puppet-pacemaker.git'

mod 'puppet',
Expand All @@ -195,7 +195,7 @@ mod 'qpid',
:git => 'https://github.com/dprince/puppet-qpid'

mod 'rabbitmq',
:commit => '45692304e66e4acfca06969574012b22def8f69b',
:commit => '1c635016237f16f99245f904885d534e17521842',
:git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'

mod 'redis',
Expand All @@ -215,7 +215,7 @@ mod 'sahara',
:git => 'https://github.com/openstack/puppet-sahara.git'

mod 'sensu',
:commit => '9bc7f4aa1bff8b2bb612f54d72df0a2730c7a0ea',
:commit => '8f4fc5780071c4895dec559eafc6030511b0caaa',
:git => 'https://github.com/sensu/sensu-puppet.git'

mod 'snmp',
Expand Down Expand Up @@ -267,7 +267,7 @@ mod 'tuskar',
:git => 'https://github.com/openstack/puppet-tuskar.git'

mod 'uchiwa',
:commit => 'a197642f71c8e5437d132d05444aff019f8ff817',
:commit => 'c1f9e42d4d15bb51a2ecc02f20fe49d40b8bf7af',
:git => 'https://github.com/Yelp/puppet-uchiwa.git'

mod 'vcsrepo',
Expand Down
1 change: 1 addition & 0 deletions apache/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ spec/fixtures/
.vagrant/
.bundle/
coverage/
log/
.idea/
*.iml
2 changes: 2 additions & 0 deletions apache/.rspec
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--format documentation
15 changes: 8 additions & 7 deletions apache/.travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
---
sudo: false
language: ruby
cache: bundler
bundler_args: --without system_tests
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
script: "bundle exec rake validate lint spec"
matrix:
fast_finish: true
include:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
notifications:
email: false
6 changes: 3 additions & 3 deletions apache/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ If you already have those gems installed, make sure they are up-to-date:
With all dependencies in place and up-to-date we can now run the tests:

```shell
% rake spec
% bundle exec rake spec
```

This will execute all the [rspec tests](http://rspec-puppet.com/) tests
Expand All @@ -178,8 +178,8 @@ installed on your system.
You can run them by issuing the following command

```shell
% rake spec_clean
% rspec spec/acceptance
% bundle exec rake spec_clean
% bundle exec rspec spec/acceptance
```

This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
Expand Down
22 changes: 11 additions & 11 deletions apache/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

def location_for(place, fake_version = nil)
if place =~ /^(git:[^#]*)#(.*)/
if place =~ /^(git[:@][^#]*)#(.*)/
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
elsif place =~ /^file:\/\/(.*)/
['>= 0', { :path => File.expand_path($1), :require => false }]
Expand All @@ -11,14 +11,16 @@ def location_for(place, fake_version = nil)
end

group :development, :unit_tests do
gem 'rspec-core', '3.1.7', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
gem 'json', :require => false
gem 'metadata-json-lint', :require => false
gem 'puppet_facts', :require => false
gem 'puppet-blacksmith', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'rspec-puppet', '>= 2.3.2', :require => false
gem 'simplecov', :require => false
end

group :system_tests do
gem 'beaker-puppet_install_helper', :require => false
if beaker_version = ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
end
Expand All @@ -27,12 +29,10 @@ group :system_tests do
else
gem 'beaker-rspec', :require => false
end
gem 'serverspec', :require => false
gem 'beaker-puppet_install_helper', :require => false
gem 'master_manipulator', :require => false
gem 'serverspec', :require => false
end



if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
Expand Down
Loading

0 comments on commit aa79f84

Please sign in to comment.