summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--puppet/all-nodes-config.yaml2
-rw-r--r--puppet/hieradata/RedHat.yaml7
-rw-r--r--puppet/hieradata/controller.yaml1
3 files changed, 9 insertions, 1 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index c50d6820..060f4c81 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -78,6 +78,8 @@ resources:
- {get_param: ceph_storage_hosts}
hiera:
datafiles:
+ RedHat:
+ raw_data: {get_file: hieradata/RedHat.yaml}
all_nodes:
mapped_data:
controller_node_ips:
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