summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-26 11:39:53 +0000
committerGerrit Code Review <review@openstack.org>2015-06-26 11:39:53 +0000
commit7affa78e701e227ba64d880eb7632a7ce63a21ef (patch)
treed13cafcc08c8e1b22b17761227424097d7ca4799 /puppet/hieradata
parentfeb41578d27b4e47d2cace4a5ffba306ac8ceedd (diff)
parent85901b37df03459d83e963b842537f26d26460d5 (diff)
Merge "Set MariaDB package name in RedHat.yaml"
Diffstat (limited to 'puppet/hieradata')
-rw-r--r--puppet/hieradata/RedHat.yaml7
-rw-r--r--puppet/hieradata/controller.yaml1
2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/hieradata/RedHat.yaml b/puppet/hieradata/RedHat.yaml
index f42c7159..25902828 100644
--- a/puppet/hieradata/RedHat.yaml
+++ b/puppet/hieradata/RedHat.yaml
@@ -1,2 +1,9 @@
# RedHat specific overrides go here
rabbitmq::package_provider: 'yum'
+
+# The Galera package should work in cluster and
+# non-cluster modes based on the config file.
+# We set the package name here explicitly so
+# that it matches what we pre-install
+# in tripleo-puppet-elements.
+mysql::server::package_name: 'mariadb-galera-server'
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 332e4c3e..d21b8bc6 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -92,7 +92,6 @@ 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::keystone_admin: true