From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 23 Jun 2015 09:25:14 +0000 (+0000)
Subject: Merge "Specify mariadb package name to meet puppetlabs-mysql requirement"
X-Git-Tag: opnfv-6.0.0~2470
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e156bd1bb63389e1af0ee13c85f74f55054a40ad;p=apex-tripleo-heat-templates.git

Merge "Specify mariadb package name to meet puppetlabs-mysql requirement"
---

e156bd1bb63389e1af0ee13c85f74f55054a40ad
diff --cc puppet/hieradata/controller.yaml
index 2e30f211,50cbb3f9..d0cbe890
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@@ -88,10 -90,9 +88,11 @@@ pacemaker::corosync::manage_fw: fals
  
  # horizon
  horizon::allowed_hosts: '*'
 +horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
 +
  
  mysql::server::manage_config_file: true
+ mysql::server::package_name: mariadb-galera-server
  
  
  tripleo::loadbalancer::galera_master_ip: "%{hiera('bootstrap_nodeid_ip')}"