From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Wed, 27 May 2015 19:15:23 +0000 (+0200)
Subject: Specify mariadb package name to meet puppetlabs-mysql requirement
X-Git-Tag: opnfv-6.0.0~2470^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a1b3fa3e84185b6969a8acfda475fe7fc48bd5a1;p=apex-tripleo-heat-templates.git

Specify mariadb package name to meet puppetlabs-mysql requirement

Specify the MariaDB package name to meet new requirement from
puppetlabs-mysql introduce but latest commit[1][2]

[1]
https://github.com/puppetlabs/puppetlabs-mysql/commit/4bab65edcb98f82f87a4414840fe90ab81b6cea3
[2]
https://github.com/puppetlabs/puppetlabs-mysql/commit/29788fb4c492865b5246daef6cbefe99c4aa067d

Change-Id: I1b855934a88ceb4995ca1a44394db6b7a20c038d
---

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 4f46c7fb..50cbb3f9 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -92,6 +92,7 @@ pacemaker::corosync::manage_fw: false
 horizon::allowed_hosts: '*'
 
 mysql::server::manage_config_file: true
+mysql::server::package_name: mariadb-galera-server
 
 
 tripleo::loadbalancer::galera_master_ip: "%{hiera('bootstrap_nodeid_ip')}"