Commit graph

195 commits

Author SHA1 Message Date
Ryan Senior
a45c1ad8b5 Merge pull request #116 from kbarber/maint/master/use-v3-api-for-testing
Use the /v2 metrics endpoint instead of /metrics
2014-02-11 15:07:15 -06:00
Ken Barber
1c831ebe5e Fix up unit tests after /v2 changes
Signed-off-by: Ken Barber <ken@bob.sh>
2014-02-11 20:56:48 +00:00
Ken Barber
c4f71cc8c3 Use the /v2 metrics endpoint instead of /metrics
The base url /metrics has long been a deprecated URL and creates noise when
tested like this. Not to mention in current puppetdb master we are removing
/v1 support so this test starts to break.

By making it /v2, we still afford support for most of our 1.x users, and
since /v2 will be around for quite some time this seems like a suitable
temporary step.

In the future a generic URL should really be provided by PuppetDB as something
that is more permanent and generic.

Signed-off-by: Ken Barber <ken@bob.sh>
2014-02-11 20:35:13 +00:00
Ashley Penney
ba3eab6f95 Merge pull request #114 from apenney/beaker
Convert tests to beaker.
2014-02-03 08:43:36 -08:00
Ashley Penney
a344bfe83a Convert tests to beaker. 2014-02-03 16:43:01 +00:00
Hunter Haugen
625b836880 Merge pull request #113 from ghoneycutt/enable_travis_fast_finish
Enable fast finish in Travis
2014-01-23 11:10:11 -08:00
Garrett Honeycutt
09da4ace22 Enable fast finish in Travis
http://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
2014-01-23 14:08:37 -05:00
Ken Barber
6d5f329e2a Merge pull request #112 from adrianlzt/feature/allow_define_postgres_listen_address
Define parameter in puppetdb class to define postgres listen address
2014-01-13 06:07:22 -08:00
Adrian Lopez
b86270b0f3 Define parameter in puppetdb class to define postgres listen address 2014-01-12 22:57:18 +01:00
Ken Barber
10ea45f7a4 Merge pull request #107 from ebarrere/ebFix_puppetdb_conn_validator
Fix puppetlabs#106 and one other bug when disable_ssl = true
2014-01-10 10:32:26 -08:00
Ryan Senior
2c92b6097f Merge pull request #110 from kbarber/rspec_puppet_v1
Support rspec-puppet v1.0.0
2014-01-02 08:36:54 -08:00
Ken Barber
9d85e06c9d Pin rspec-puppet to 1.x releases
Since contain_class is only in 1.x or greater, we add an explicit pin in the
Gemfile for this.

Signed-off-by: Ken Barber <ken@bob.sh>
2014-01-02 15:43:22 +00:00
Garrett Honeycutt
02a9cf0da4 Support rspec-puppet v1.0.0
include_class has been replaced with contain_class.
http://bombasticmonkey.com/2013/12/05/rspec-puppet-1.0.0/
2013-12-27 17:34:14 -05:00
Elliott Barrere 
05cf44b937 Enable soft_write_failure setting when $puppetdb::disablessl = true
The puppet agent will refuse to run if it can’t make a secure
connection to the puppetdb server.  This setting disables that in case
SSL is disabled.
2013-12-11 14:36:32 -08:00
Elliott Barrere 
51a08a85b4 Fix issue with validator when disable_ssl = true
https://github.com/puppetlabs/puppetlabs-puppetdb/issues/106
2013-12-11 14:34:52 -08:00
Ken Barber
6b47c83477 Merge pull request #101 from jhoblitt/concat_update
Concat update
2013-11-04 05:04:30 -08:00
Joshua Hoblitt
9714cb16b8 update ripienaar/concat -> puppetlabs/concat 2013-11-02 07:53:23 -07:00
Ken Barber
21e31b9a67 Merge pull request #100 from ScottDuckworth/master
fix validation regular expressions
2013-10-29 09:43:22 -07:00
Scott Duckworth
d25044f6c7 fix validation regular expressions 2013-10-29 12:15:35 -04:00
Ashley Penney
426af2b656 Merge pull request #97 from apenney/travis
Add missing PUBLISHER_LOGIN variable.
2013-10-28 09:58:45 -07:00
Ashley Penney
cf0e7fb14c Add missing PUBLISHER_LOGIN variable. 2013-10-28 12:57:55 -04:00
Ryan Senior
c0f33d8041 Merge pull request #95 from kbarber/maint/master/release_300
Release 3.0.0
2013-10-28 09:29:02 -07:00
Ashley Penney
69e9bcd749 Merge pull request #96 from apenney/travis
Add auto-publishing.
2013-10-28 09:23:25 -07:00
Ashley Penney
b8c2265889 Add auto-publishing. 2013-10-28 12:18:58 -04:00
Ken Barber
923e35d6c0 Release 3.0.0
This updates the CHANGELOG and module metadata files for a new major release.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-28 16:13:32 +00:00
Ashley Penney
97dd235ba3 Merge pull request #94 from kbarber/ticket/master/GH-93-use-postgresql-3
(GH-93) Switch to using puppetlabs-postgresql 3.x
2013-10-28 09:05:05 -07:00
Ken Barber
684b24c668 Make sure the correct ntp packages are installed
Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-27 13:56:45 +01:00
Ken Barber
3c71c5f8cf Update test fixtures and module dependencies to use postgresql 3.1.0
Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-27 01:33:29 +02:00
Ken Barber
78a2530e03 Ensure ntpdate executes early
This is to avoid any time slew problems related to ntp shifting the time
later on in the background.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-27 00:11:02 +01:00
Ken Barber
c29fb59a68 Adjust memory for PuppetDB tests to avoid OOM killer
The tests were failing on Ubuntu, and I noticed that the OOM killer
was killing java. This patch increases the memory size for each
image to avoid this.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-27 00:52:18 +02:00
Ken Barber
683bda3e3e Fix idempotency tests
Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-22 13:22:05 +01:00
Ken Barber
cce5324642 Simplify puppet module install parts for testing
Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-22 12:54:08 +01:00
Ken Barber
69fa8ec662 Fix copyright and project notice
Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-21 19:15:38 +01:00
Ken Barber
603df7381d (GH-93) Switch to using puppetlabs-postgresql 3.x
This updates the module to be able to use puppetlabs-postgresql.

Since this change is a major change, it marks this patch as a breaking change.

I have prepared a suitable amount of upgrade notes for upgrading to this later
version of the module plus removed anything marked deprecated.

As cleanup, I've removed the troublesome 'tests' directory in favour of good
README.md documentation. I've also removed any puppet docs from each module
until such times as puppet docs become automated through the forge. This is
just to avoid contributors having to double their efforts - the README.md
is the authority now.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-21 18:43:41 +01:00
Ryan Senior
3ceca19f30 Merge pull request #92 from kbarber/ticket/master/GH-91-rspec-system-2
(GH-91) Update to use rspec-system-puppet 2.x
2013-10-21 06:52:01 -07:00
Ken Barber
d3bf0a09ae (GH-91) Update to use rspec-system-puppet 2.x
This will bring us up-to-date with the latest version of the rspec-system-*
family.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-21 14:25:28 +01:00
Ken Barber
c09ac02f95 Merge pull request #80 from stdietrich/add_ssl_switch
Add switch to configure database SSL connection
2013-10-19 14:08:59 -07:00
Stefan Dietrich
c7ef4079ec Document new database_ssl option in README 2013-10-19 19:56:46 +02:00
Stefan Dietrich
d6202bdda2 Disable database validation, if SSL is enabled 2013-10-19 19:56:46 +02:00
Stefan Dietrich
84c5fa79ea Add switch to configure database SSL connection
PostgreSQL supports secure connections through SSL. For PuppetDB
to connect with SSL, "?ssl=true" has to be specified on the
connection string.

This patch adds such a switch, by default PuppetDB will not use SSL
to connect to the database.
2013-10-19 19:56:46 +02:00
Ken Barber
79ef2823d4 Merge pull request #87 from apenney/metadata
FM-103: Add metadata.json to all modules.
2013-10-18 09:36:00 -07:00
Ken Barber
39e8f6c919 Merge pull request #89 from ghoneycutt/soft_write_failure
Add soft_write_failure to puppetdb.conf
2013-10-18 09:29:44 -07:00
Ashley Penney
902ab15f04 Update metadata.json
Make Puppet versions strings, and update for 2.0.
2013-10-18 12:20:52 -04:00
Garrett Honeycutt
77c74e7421 Document puppetdb_soft_write_failure in README 2013-10-18 12:03:28 -04:00
Deepak Giridharagopal
a3d884ab26 Merge pull request #90 from kbarber/maint/master/pin-system-tests-to-old-postgresql-module
This will pin the installation of puppetlabs/postgresql to version 2.5.0
2013-10-18 09:03:04 -07:00
Garrett Honeycutt
70c73c78ba Add params to support soft_write_failure option as per Ken Barber
I can rebase these commits once the code is debugged and to your
liking.
2013-10-18 12:00:14 -04:00
Ken Barber
3306f1f265 This will pin the installation of puppetlabs/postgresql to version 2.5.0
Since version 3.0.0 is now released, we want to pin against the old revision
everywhere. We already pin in the Modulefile and unit tests, we just forgot
to do it for the rspec-system tests.

Signed-off-by: Ken Barber <ken@bob.sh>
2013-10-18 16:40:21 +01:00
Ryan Senior
d7b43c207d Merge pull request #85 from kbarber/ticket/master/release-20
Release 2.0.0
2013-10-18 07:35:25 -07:00
Garrett Honeycutt
d440f1b3ea Add soft_write_failure to puppetdb.conf
This supports a recently added feature to PuppetDB.
2013-10-17 11:49:47 -04:00
Ashley Penney
85684640b7 FM-103: Add metadata.json to all modules.
I've been asked to add metadata.json to all modules.  I've just
listed the main RedHat/Debian distros as supported for now.
2013-10-08 11:15:49 -07:00