From 0fded85f6e91bf56c0876c152e395498c235531e Mon Sep 17 00:00:00 2001
From: Manuel Montecelo <mmontecelo@sipwise.com>
Date: Wed, 28 Nov 2018 19:05:29 +0100
Subject: [PATCH] TT#47721 Use mariadb.cnf instead of my.cnf, restore
 "alternatives" symlinks

After changes to restore /etc/mysql/my.cnf to keep using "alternatives" and the
configuration moving to mariadb.cnf, as the packages coming from Debian, modify
these tests to check the new expected scenario.

Change-Id: If43c842e633151e895754f6a345472cdb9c9888c
---
 templates/130_filesys-ngcp.yaml.tt2 | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/templates/130_filesys-ngcp.yaml.tt2 b/templates/130_filesys-ngcp.yaml.tt2
index 32c532d..bb94a03 100644
--- a/templates/130_filesys-ngcp.yaml.tt2
+++ b/templates/130_filesys-ngcp.yaml.tt2
@@ -160,6 +160,17 @@ file:
     filetype: directory
     contains: []
 
+  /etc/mysql/mariadb.cnf:
+    exists: true
+    mode: "0444"
+    owner: root
+    group: root
+    filetype: file
+    contains:
+    - '/^\[mysql\]$/'
+    - '/^\[mysqld\]$/'
+    - '/^\[mysqldump\]$/'
+
   /etc/mysql/inc/my.client.cnf:
     exists: true
     mode: "0444"
@@ -202,10 +213,11 @@ file:
 
   /etc/mysql/my.cnf:
     exists: true
-    mode: "0444"
+    mode: "0777"
     owner: root
     group: root
-    filetype: file
+    linked-to: /etc/alternatives/my.cnf
+    filetype: symlink
     contains: []
 
   /etc/mysql/sipwise.cnf:
@@ -221,6 +233,6 @@ file:
     mode: "0777"
     owner: root
     group: root
-    linked-to: /etc/mysql/my.cnf
+    linked-to: /etc/mysql/mariadb.cnf
     filetype: symlink
     contains: []