From 80a901458994d944a057f574decbeb84f1edbfa7 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Wed, 3 Dec 2014 15:44:42 -0500
Subject: [PATCH] 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
---
 manifests/server.pp            | 7 ++++++-
 manifests/worker.pp            | 7 ++++++-
 templates/subunit2sql.conf.erb | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/manifests/server.pp b/manifests/server.pp
index 864e06c..a825468 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -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':
diff --git a/manifests/worker.pp b/manifests/worker.pp
index 3b7752d..d03038a 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -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}"
 
diff --git a/templates/subunit2sql.conf.erb b/templates/subunit2sql.conf.erb
index 3d16db6..70c0166 100644
--- a/templates/subunit2sql.conf.erb
+++ b/templates/subunit2sql.conf.erb
@@ -1,4 +1,4 @@
 [DEFAULT]
 
 [database]
-connection = <%= subunit2sql_db_uri %>
+connection = <%= @db_dialect %>://<%= @db_user %>:<%= @db_pass %>@<%= @db_host %>:<%= @db_port %>/<%= @db_name %>