From 62c7e5abaddf529efeb45d158248e10437d30ce8 Mon Sep 17 00:00:00 2001
From: Sergii Kipot <skipot@sipwise.com>
Date: Thu, 16 Apr 2020 12:27:30 +0200
Subject: [PATCH] TT#78202 Fix goss checks for pro mysql config files

The templates for old these files were removed. Replacing them
with new my.mysqld1.cnf one

Change-Id: I1e15621f03d16edf5ea9df282351784c1c277ebd
---
 templates/131_filesys-ngcp-pro.yaml.tt2 | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/templates/131_filesys-ngcp-pro.yaml.tt2 b/templates/131_filesys-ngcp-pro.yaml.tt2
index 9ef592f..404b82a 100644
--- a/templates/131_filesys-ngcp-pro.yaml.tt2
+++ b/templates/131_filesys-ngcp-pro.yaml.tt2
@@ -107,7 +107,7 @@ file:
     linked-to: /mnt/glusterfs/mgmt-share/approx/
     filetype: symlink
 
-  /etc/mysql/inc/my.mysqld2.cnf:
+  /etc/mysql/inc/my.mysqld1.cnf:
     exists: true
     mode: "0444"
     owner: root
@@ -115,33 +115,19 @@ file:
     filetype: file
     contains: []
 
-  /etc/mysql/conf.d/my2.cnf:
-    exists: true
-    mode: "0440"
-    owner: root
-    group: mysql
-    filetype: file
-    contains: []
-[% IF general.ngcp_type == 'sppro' -%]
-    size: 0
-[% END -%]
-
-  /etc/mysql/inc/my.mysqld1.carrier_db.cnf:
+  /etc/mysql/inc/my.mysqld2.cnf:
     exists: true
     mode: "0444"
     owner: root
     group: root
     filetype: file
     contains: []
-[% IF general.ngcp_type == 'sppro' -%]
-    size: 0
-[% END -%]
 
-  /etc/mysql/inc/my.mysqld1.carrier_non_db.cnf:
+  /etc/mysql/conf.d/my2.cnf:
     exists: true
-    mode: "0444"
+    mode: "0440"
     owner: root
-    group: root
+    group: mysql
     filetype: file
     contains: []
 [% IF general.ngcp_type == 'sppro' -%]