summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-25 08:21:33 +0000
committerGerrit Code Review <review@openstack.org>2015-06-25 08:21:33 +0000
commitbf78ec665bc8d737bc71516e801088ae650d3ca6 (patch)
tree3f2175ff9ea6786326a720a7e7ebc76300f4e778
parent7852f5da56a0a1d7b4ce2bf6f46d70700ffeea82 (diff)
parentb3e17d52acde82718a2354a08d42e6f0aaa35ad0 (diff)
Merge "Do not set explicitly galera_master to any of the nodes"
-rw-r--r--puppet/hieradata/controller.yaml5
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index d0cbe890..332e4c3e 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -90,14 +90,11 @@ pacemaker::corosync::manage_fw: false
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