From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 26 Jun 2015 11:39:53 +0000 (+0000)
Subject: Merge "Set MariaDB package name in RedHat.yaml"
X-Git-Tag: opnfv-6.0.0~2464
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7affa78e701e227ba64d880eb7632a7ce63a21ef;p=apex-tripleo-heat-templates.git

Merge "Set MariaDB package name in RedHat.yaml"
---

7affa78e701e227ba64d880eb7632a7ce63a21ef
diff --cc puppet/hieradata/controller.yaml
index 332e4c3e,2e30f211..d21b8bc6
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@@ -90,11 -90,13 +90,10 @@@ pacemaker::corosync::manage_fw: fals
  horizon::allowed_hosts: '*'
  horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
  
 -
 +# mysql
  mysql::server::manage_config_file: true
- mysql::server::package_name: mariadb-galera-server
  
  
 -tripleo::loadbalancer::galera_master_ip: "%{hiera('bootstrap_nodeid_ip')}"
 -tripleo::loadbalancer::galera_master_hostname: "%{hiera('bootstrap_nodeid')}"
 -
  tripleo::loadbalancer::keystone_admin: true
  tripleo::loadbalancer::keystone_public: true
  tripleo::loadbalancer::neutron: true