FIX: mariadb cluster failed on centos7

JIRA:COMPASS-373
  - use shell to support the parameter
  - remove blank user
  - adapte http service name and config path

Change-Id: I6625f3c53bfa8ff3e3792ec339aa2e63bcf1da83
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>

1 files changed, 4 insertions, 48 deletions

diff --git a/deploy/adapters/ansible/roles/database/tasks/mariadb_cluster.yml b/deploy/adapters/ansible/roles/database/tasks/mariadb_cluster.yml
index 8fdb1437..84704fa4 100644
--- a/deploy/adapters/ansible/roles/database/tasks/mariadb_cluster.yml
+++ b/deploy/adapters/ansible/roles/database/tasks/mariadb_cluster.yml
@@ -7,52 +7,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- name: get cluster status
-  shell: mysql --silent --skip-column-names -e 'SHOW STATUS LIKE "wsrep_evs_state"'|awk '{print $2}'
-  register: cluster_status
-  when:
-    - inventory_hostname == haproxy_hosts.keys()[0]
+- include: mariadb_cluster_debian.yml
+  when: ansible_os_family == "Debian"
 
-- name: start first node to create new cluster
-  service:
-    name: mysql
-    state: restarted
-    enabled: yes
-    args: "--wsrep-new-cluster"
-  when: |
-    inventory_hostname == haproxy_hosts.keys()[0]
-    and not cluster_status.stdout | search("OPERATIONAL")
-
-- name: wait for cluster ready
-  shell: mysql --silent --skip-column-names -e 'SHOW STATUS LIKE "wsrep_evs_state"'|awk '{print $2}'
-  register: cluster_status
-  until: cluster_status|success
-  failed_when: not cluster_status.stdout | search("OPERATIONAL")
-  retries: 10
-  delay: 3
-  when: |
-    inventory_hostname == haproxy_hosts.keys()[0]
-    and not cluster_status.stdout | search("OPERATIONAL")
-
-- name: if I in the cluster nodes
-  shell: mysql --silent --skip-column-names -e 'SHOW STATUS LIKE "wsrep_incoming_addresses"'|awk '{print $2}'
-  register: cluster_nodes
-  changed_when: false
-
-- name: restart other nodes and join cluster
-  service:
-    name: mysql
-    state: restarted
-    enabled: yes
-  when: |
-    inventory_hostname != haproxy_hosts.keys()[0]
-    and not cluster_nodes.stdout | search("{{ internal_ip }}")
-
-- name: restart first nodes
-  service:
-    name: mysql
-    state: restarted
-  when: |
-    (inventory_hostname == haproxy_hosts.keys()[0]
-    and haproxy_hosts|length > 1
-    and not cluster_nodes.stdout | search('{{ internal_ip }}'))
+- include: mariadb_cluster_redhat.yml
+  when: ansible_os_family == "RedHat"