From 87612abc0e24cafd89a49e350165b08fe1608233 Mon Sep 17 00:00:00 2001 From: baigk Date: Thu, 6 Aug 2015 02:37:33 -0400 Subject: support deployment openstack juno with ansible for compass in centos7.1 JIRA: COMPASS-6 Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b Signed-off-by: baigk --- deploy/adapters/ansible/roles/database/tasks/mariadb.yml | 14 +++++++------- deploy/adapters/ansible/roles/database/tasks/mysql.yml | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'deploy/adapters/ansible/roles/database/tasks') diff --git a/deploy/adapters/ansible/roles/database/tasks/mariadb.yml b/deploy/adapters/ansible/roles/database/tasks/mariadb.yml index 50618bfc..dbd76c68 100644 --- a/deploy/adapters/ansible/roles/database/tasks/mariadb.yml +++ b/deploy/adapters/ansible/roles/database/tasks/mariadb.yml @@ -1,16 +1,17 @@ --- - name: install python-mysqldb - action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes" - with_items: maridb_packages + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + with_items: maridb_packages | union(packages_noarch) - name: create mysql log directy file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755 -- name: update mariadb my.cnf - template: src=my.cnf dest=/etc/mysql/my.cnf backup=yes +- name: update mariadb config file + template: src={{ item }} dest={{ mysql_config_file_path }}/{{ item }} backup=yes + with_items: mysql_config_file_name - name: update galera wsrep.cnf - template: src=wsrep.cnf dest=/etc/mysql/conf.d/wsrep.cnf backup=yes + template: src=wsrep.cnf dest={{ wsrep_config_file_path }}/wsrep.cnf backup=yes - name: update wsrep_sst_rsync uid lineinfile: dest=/usr/bin/wsrep_sst_rsync state=absent regexp="\s*uid = \$MYUID$" backup=yes @@ -29,8 +30,7 @@ - name: generate mysql service list shell: echo {{ item }} >> /opt/service - with_items: - - mysql + with_items: services_noarch - name: create database/user shell: /opt/data.sh diff --git a/deploy/adapters/ansible/roles/database/tasks/mysql.yml b/deploy/adapters/ansible/roles/database/tasks/mysql.yml index 8005292e..809d6172 100644 --- a/deploy/adapters/ansible/roles/database/tasks/mysql.yml +++ b/deploy/adapters/ansible/roles/database/tasks/mysql.yml @@ -6,10 +6,9 @@ - name: create mysql log directy file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755 -- name: update mysql my.cnf - copy: src=my.cnf - dest=/etc/mysql/my.cnf - backup=yes +- name: update mysql config file + copy: src= {{ item }} dest={{ mysql_config_file_path }}/{{ item }} backup=yes + with_items: mysql_config_file_name - name: manually restart mysql server shell: service mysql restart -- cgit 1.2.3-korg