Switch subunit2sql to use decomposed uri

This commit switches the subunit2sql_uri which get's passed into the
config file template to use decomposed values. The advantage of this
is that it enables using subsets of the information elsewhere.

Change-Id: I30b5117c12897fa3a1cb1e2579b4eec59ba57b2b
This commit is contained in:
Matthew Treinish 2014-12-03 15:44:42 -05:00
parent 94be2380a3
commit 80a9014589
3 changed files with 13 additions and 3 deletions

View File

@ -16,7 +16,12 @@
# == Class: subunit2sql
#
class subunit2sql::server (
$subunit2sql_db_uri,
$db_dialect = 'mysql',
$db_user = 'subunit2sql',
$db_pass,
$db_host,
$db_port = '3306',
$db_name = 'subunit2sql',
) {
file { '/etc/subunit2sql.conf':

View File

@ -17,7 +17,12 @@
#
define subunit2sql::worker (
$config_file,
$subunit2sql_db_uri,
$db_dialect = 'mysql',
$db_user = 'subunit2sql',
$db_pass,
$db_host,
$db_port = '3306',
$db_name = 'subunit2sql'
) {
$suffix = "-${name}"

View File

@ -1,4 +1,4 @@
[DEFAULT]
[database]
connection = <%= subunit2sql_db_uri %>
connection = <%= @db_dialect %>://<%= @db_user %>:<%= @db_pass %>@<%= @db_host %>:<%= @db_port %>/<%= @db_name %>