Commit graph

6 commits

Author SHA1 Message Date
Reid Vandewiele
bf0ab45620 Fix embedded db setup in Puppet Enterprise
The subname value in database.ini when using an embedded database varies
between the Puppet Enterprise package and the FOSS Puppet package.
Previously, the PuppetDB module could not successfully manage an
embedded database on a PE master. This commit adds an additional
parameter and utilization to account for this.
2012-10-17 13:28:01 -07:00
Chris Price
a65afcc1f1 Fix duplicate stanza in database_ini.pp
There was a minor problem with a merge conflict in the previous
commit.  This commit should fix it.
2012-09-20 16:59:39 -07:00
Chris Price
4360004ea2 Merge remote-tracking branch 'ghoneycutt/ticket/1.0.x/xxxx_style_updates' into maint/master/resolve-merge-conflict
Conflicts:
	manifests/server/database_ini.pp
2012-09-20 16:22:46 -07:00
Garrett Honeycutt
1aab5d98b0 complies with style guide 2012-09-20 14:46:26 -07:00
Chris Price
be683b7b5a Fix invalid subname in database.ini
For the postgres subname, the module was writing the wrong value
for the database instance name.  This commit fixes that bug.
2012-09-19 13:44:39 -07:00
Chris Price
8fbda3c4d6 Use ini_file to manage settings, and add validation
This commit does the following:

* Use the new inifile module to manage puppet.conf
* More comprehensive management of config files
* Validate database connectivity before applying puppetdb
  config changes
* Validate puppetdb connectivity before applying puppet
  master config changes
* Documentation
2012-09-17 15:26:32 -07:00