Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: ce51c10 a1b3fa3)
Merge "Specify mariadb package name to meet puppetlabs-mysql requirement"
authorJenkins <jenkins@review.openstack.org>
Tue, 23 Jun 2015 09:25:14 +0000 (09:25 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 23 Jun 2015 09:25:14 +0000 (09:25 +0000)
1  2 
puppet/hieradata/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc puppet/hieradata/controller.yaml
index 2e30f21,50cbb3f..d0cbe89
--- 1/puppet/hieradata/controller.yaml
--- 2/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')}"