# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1425859287 0
# Node ID 204330fea19acbb2a316c07ab17e0f4c0fd58249
# Parent  aa40b53324e46836e434b1363eae5f29d0ef8677
Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)

diff -r aa40b53324e4 -r 204330fea19a hiera.yaml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hiera.yaml	Mon Mar 09 00:01:27 2015 +0000
@@ -0,0 +1,6 @@
+---
+:backends: yaml
+:yaml:
+  :datadir: /var/lib/hiera
+:hierarchy: common
+:logger: console
\ No newline at end of file
diff -r aa40b53324e4 -r 204330fea19a manifests/templates.pp
--- a/manifests/templates.pp	Sun Mar 08 23:58:22 2015 +0000
+++ b/manifests/templates.pp	Mon Mar 09 00:01:27 2015 +0000
@@ -5,6 +5,16 @@
 
 	include defaultusers
 	include logwatch
+
+	file { '/etc/puppet/hiera.yaml':
+		ensure => present,
+		content => "---
+:backends: yaml
+:yaml:
+  :datadir: /var/lib/hiera
+:hierarchy: common
+:logger: console",
+	}
 }
 
 class basevpsnode (
@@ -223,11 +233,22 @@
 		suffix => '55ibb', #IBBoard's rebuild of Webtatic's PHP 5.5
 		opcache => 'opcache',
 	}
+
 	#Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user
+
+	if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 {
+		$mysqlpackage = 'mariadb'
+		$mysqlsuffix = ''
+	}
+	else {
+		$mysqlpackage = 'mysql'
+		$mysqlsuffix = '55w'
+	}
 	class { 'website::mysql':
 		mysqluser => template('defaultusers/mysql-user'),
 		mysqlpassword => template('defaultusers/mysql-password'),
-		mysqlsuffix => '55w',
+		mysqlprefix => $mysqlpackage,
+		mysqlsuffix => $mysqlsuffix,
 		phpsuffix => '55ibb',
 		phpmysqlsuffix => 'nd'
 	}