summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/database
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-08-22 02:20:01 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-08-22 02:20:01 +0000
commitfa0b0bebe9130e71f9b41659a233b61406eab884 (patch)
tree95d8e6b4ebf4561ecfdd785966a15f8e3c0e037d /deploy/adapters/ansible/roles/database
parentf51b76b181bf2c6e396fecbe8088ef23e8109389 (diff)
parent444407f6ff854b9a3dfa5c7ad50e4ac6495ed9fd (diff)
Merge "Neutron-related role in the compass-adapter should use the same template file"
Diffstat (limited to 'deploy/adapters/ansible/roles/database')
-rw-r--r--deploy/adapters/ansible/roles/database/tasks/mysql.yml2
-rw-r--r--deploy/adapters/ansible/roles/database/vars/Debian.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/database/tasks/mysql.yml b/deploy/adapters/ansible/roles/database/tasks/mysql.yml
index 809d6172..9e272d1b 100644
--- a/deploy/adapters/ansible/roles/database/tasks/mysql.yml
+++ b/deploy/adapters/ansible/roles/database/tasks/mysql.yml
@@ -7,7 +7,7 @@
file: path=/var/log/mysql state=directory owner=mysql group=mysql mode=0755
- name: update mysql config file
- copy: src= {{ item }} dest={{ mysql_config_file_path }}/{{ item }} backup=yes
+ copy: src={{ item }} dest={{ mysql_config_file_path }}/{{ item }} backup=yes
with_items: mysql_config_file_name
- name: manually restart mysql server
diff --git a/deploy/adapters/ansible/roles/database/vars/Debian.yml b/deploy/adapters/ansible/roles/database/vars/Debian.yml
index df6d3f17..79f7008c 100644
--- a/deploy/adapters/ansible/roles/database/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/database/vars/Debian.yml
@@ -15,6 +15,6 @@ maridb_packages:
services: []
mysql_config_file_path: "/etc/mysql"
-mysql_config_file_name: "my.cnf"
+mysql_config_file_name: ["my.cnf"]
wsrep_config_file_path: "/etc/mysql/conf.d"
wsrep_provider_file: "/usr/lib/galera/libgalera_smm.so"