(PDB-1455) Provide mechanism for modifying default HSQLDB path #185
Conversation
| @@ -70,7 +70,7 @@ | |||
| case $::osfamily { | |||
| 'RedHat', 'Suse', 'Archlinux': { | |||
| $confdir = '/etc/puppetdb/conf.d' | |||
| $embedded_subname = 'file:/var/lib/puppetdb/db/db;hsqldb.tx=mvcc;sql.syntax_pgs=true' | |||
| $database_path = '/var/lib/puppetdb/db/db' | |||
There was a problem hiding this comment.
The embedded_subname was never a configurable parameter, so I've switched the focus here over to just the path - now we fill in the remaining parts of subname inside database_ini.pp in only one place (since it never should be different per OS anyway).
kbarber
force-pushed
the
ticket/stable/pdb-1455-allow-custom-embedded-subname
branch
from
9a10b86
to
2da3eee
Compare
| @@ -0,0 +1,140 @@ | |||
| require 'spec_helper' | |||
There was a problem hiding this comment.
There was no coverage here, so I've added default coverage+tests for this particular change.
kbarber
force-pushed
the
ticket/stable/pdb-1455-allow-custom-embedded-subname
branch
from
2da3eee
to
b871568
Compare
| @@ -257,6 +257,10 @@ Setting up proper trust- and keystores has to be managed outside of the puppetdb | |||
|
|
|||
| If true, the module will attempt to connect to the database using the specified settings and fail if it is not able to do so. (defaults to true) | |||
|
|
|||
| ####`database_path` | |||
There was a problem hiding this comment.
I'd prefer this be called something more like embedded_database_path just to be explicit about the case it's used for, it will also signal to users that they need not care about it.
There was a problem hiding this comment.
How about database_embedded_path? Thats how all the other variables are named.
There was a problem hiding this comment.
Done, you'll want to git diff -w, since we still use the aligning arrows/equals style here and I had to line up a lot of stuff since database_embedded_path is long :-).
|
👍 modulo the name change, let me know what you think about that |
This provides an override mechanism for providing a custom path to HSQLDB. This allows users to provide any path to their HSQLDB database. It is needed specifically for managing the as-yet-unreleased version of PuppetDB as well. Signed-off-by: Ken Barber <ken@bob.sh>
kbarber
force-pushed
the
ticket/stable/pdb-1455-allow-custom-embedded-subname
branch
from
b871568
to
1b661fd
Compare
|
lgtm tests passed for me locally, I'll merge when they go green |
|
@ajroetker green now. |
…tom-embedded-subname (PDB-1455) Provide mechanism for modifying default HSQLDB path
This provides an override mechanism for providing a custom path to HSQLDB.
This allows users to provide any path to their HSQLDB database. It is needed
specifically for managing the as-yet-unreleased version of PuppetDB as well.
Signed-off-by: Ken Barber ken@bob.sh