From 0d7c2bd52d8e95672435d8cc0c452a633d72ca5c Mon Sep 17 00:00:00 2001
From: jygaulier <gaulier@alchemy.fr>
Date: Thu, 14 Dec 2017 11:15:07 +0100
Subject: [PATCH] PHRAS-1760_Provisionning-error_Master (#2396)

fix mismatch "database" (bad) -> "appbox_db" (good) variable in ansible scripts
---
 resources/ansible/roles/app/templates/configuration.tpl | 2 +-
 resources/ansible/roles/mariadb/tasks/main.yml          | 2 +-
 resources/ansible/vars/all.yml                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/ansible/roles/app/templates/configuration.tpl b/resources/ansible/roles/app/templates/configuration.tpl
index 346f11020b..bf39dd9a68 100644
--- a/resources/ansible/roles/app/templates/configuration.tpl
+++ b/resources/ansible/roles/app/templates/configuration.tpl
@@ -12,7 +12,7 @@ main:
         port: 3306
         user: '{{ mariadb.user }}'
         password: '{{ mariadb.password }}'
-        dbname: '{{ mariadb.database }}'
+        dbname: '{{ mariadb.appbox_db }}'
         driver: pdo_mysql
         charset: UTF8
     database-test:
diff --git a/resources/ansible/roles/mariadb/tasks/main.yml b/resources/ansible/roles/mariadb/tasks/main.yml
index 6e87843ac9..0fbc016ca1 100644
--- a/resources/ansible/roles/mariadb/tasks/main.yml
+++ b/resources/ansible/roles/mariadb/tasks/main.yml
@@ -47,7 +47,7 @@
     - "{{ mariadb.alt_databox_db }}"
 
 - name: mariadb | Import dump
-  mysql_db: name={{ mariadb.database }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
+  mysql_db: name={{ mariadb.appbox_db }} state=import login_user=root login_password={{ mariadb.root_password }} target=/vagrant/{{ mariadb.dump }}
   when: mariadb.dump
 
 - name: mariadb | Create users
diff --git a/resources/ansible/vars/all.yml b/resources/ansible/vars/all.yml
index 1475cc804d..26f2941820 100644
--- a/resources/ansible/vars/all.yml
+++ b/resources/ansible/vars/all.yml
@@ -41,7 +41,7 @@ nginx:
 mariadb:
     install: '1'
     root_password: toor
-    database: ab_master
+    appbox_db: ab_master
     databox_db: db_master
     alt_databox_db: db_alt
     user: phraseanet