From 95343d26c8d2cc9789b87a77748b3e7becd548ca Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Fri, 18 Sep 2015 14:55:04 +0800 Subject: separate the mgmt vip from public vip, remove HA_VIP Change-Id: Iaa877b7ce93ba9c12bc9be6f3bd101779f07ae9c JIRA: COMPASS-51 --- deploy/adapters/ansible/roles/database/templates/my.cnf | 3 +-- deploy/adapters/ansible/roles/database/templates/server.cnf | 2 +- deploy/adapters/ansible/roles/database/templates/wsrep.cnf | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'deploy/adapters/ansible/roles/database/templates') diff --git a/deploy/adapters/ansible/roles/database/templates/my.cnf b/deploy/adapters/ansible/roles/database/templates/my.cnf index f88f4772..2023185d 100644 --- a/deploy/adapters/ansible/roles/database/templates/my.cnf +++ b/deploy/adapters/ansible/roles/database/templates/my.cnf @@ -45,8 +45,7 @@ skip-name-resolve # # Instead of skip-networking the default is now to listen only on # localhost which is more compatible and is not less secure. -#bind-address = {{ hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address }} -bind-address = {{ HA_VIP }} +bind-address = {{ internal_vip.ip }} # # * Fine Tuning # diff --git a/deploy/adapters/ansible/roles/database/templates/server.cnf b/deploy/adapters/ansible/roles/database/templates/server.cnf index e0893c0f..57441ddf 100644 --- a/deploy/adapters/ansible/roles/database/templates/server.cnf +++ b/deploy/adapters/ansible/roles/database/templates/server.cnf @@ -15,7 +15,7 @@ max_connections = 2000 max_connect_errors = 8000 skip-host-cache skip-name-resolve -bind-address = {{ HA_VIP }} +bind-address = {{ internal_vip.ip }} # # * Galera-related settings # diff --git a/deploy/adapters/ansible/roles/database/templates/wsrep.cnf b/deploy/adapters/ansible/roles/database/templates/wsrep.cnf index 6c14b155..197640c9 100644 --- a/deploy/adapters/ansible/roles/database/templates/wsrep.cnf +++ b/deploy/adapters/ansible/roles/database/templates/wsrep.cnf @@ -31,8 +31,7 @@ query_cache_type=0 # Override bind-address # In some systems bind-address defaults to 127.0.0.1, and with mysqldump SST # it will have (most likely) disastrous consequences on donor node -#bind-address={{ hostvars[inventory_hostname]['ansible_' + INTERNAL_INTERFACE].ipv4.address }} -bind-address={{ HA_VIP }} +bind-address={{ internal_vip.ip }} ## ## WSREP options @@ -56,7 +55,7 @@ wsrep_cluster_address=gcomm://{{ haproxy_hosts.values()|join(",") }} # Base replication [:port] of the node. # The values supplied will be used as defaults for state transfer receiving, # listening ports and so on. Default: address of the first network interface. -wsrep_node_address={{ internal_ips[inventory_hostname] }} +wsrep_node_address={{ internal_ip }} # Address for incoming client connections. Autodetect by default. #wsrep_node_incoming_address= -- cgit 1.2.3-korg