From d8a5c7c85f5342022e5bae7ac1cf144d888a39db Mon Sep 17 00:00:00 2001
From: William Dyson <wdyson@cloudera.com>
Date: Tue, 1 Mar 2022 09:21:48 +0000
Subject: [PATCH] removed cloudera.cnf mysql cnf template evaluation as
 collection does this for us

---
 .../rdbms/tasks/mariadb-Debian.yml            |  4 ----
 .../rdbms/tasks/mariadb-RedHat.yml            |  4 ----
 .../rdbms/tasks/mysql-conf-file.yml           | 20 -------------------
 .../{cloudera.cnf.j2 => cloudera.cnf}         |  0
 roles/infrastructure/rdbms/vars/mariadb.yml   |  2 +-
 5 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 roles/infrastructure/rdbms/tasks/mysql-conf-file.yml
 rename roles/infrastructure/rdbms/templates/{cloudera.cnf.j2 => cloudera.cnf} (100%)

diff --git a/roles/infrastructure/rdbms/tasks/mariadb-Debian.yml b/roles/infrastructure/rdbms/tasks/mariadb-Debian.yml
index 6d4ed724..646e6696 100644
--- a/roles/infrastructure/rdbms/tasks/mariadb-Debian.yml
+++ b/roles/infrastructure/rdbms/tasks/mariadb-Debian.yml
@@ -14,10 +14,6 @@
 
 ---
 
-- name: Set MySQL cnf file
-  include_tasks:
-    file: mysql-conf-file.yml
-
 - name: Install MariaDB apt key
   apt_key:
     url: https://mariadb.org/mariadb_release_signing_key.asc
diff --git a/roles/infrastructure/rdbms/tasks/mariadb-RedHat.yml b/roles/infrastructure/rdbms/tasks/mariadb-RedHat.yml
index 7bc396ba..0c22bada 100644
--- a/roles/infrastructure/rdbms/tasks/mariadb-RedHat.yml
+++ b/roles/infrastructure/rdbms/tasks/mariadb-RedHat.yml
@@ -14,10 +14,6 @@
 
 ---
 
-- name: Set MySQL cnf file
-  include_tasks:
-    file: mysql-conf-file.yml
-
 - name: Install MariaDB repository
   yum_repository:
     name: MariaDB
diff --git a/roles/infrastructure/rdbms/tasks/mysql-conf-file.yml b/roles/infrastructure/rdbms/tasks/mysql-conf-file.yml
deleted file mode 100644
index 9b5375fc..00000000
--- a/roles/infrastructure/rdbms/tasks/mysql-conf-file.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021 Cloudera, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-
-- name: Build mysql.cnf
-  ansible.builtin.template:
-    src: cloudera.cnf.j2
-    dest: "{{ local_temp_dir }}/cloudera.cnf"
diff --git a/roles/infrastructure/rdbms/templates/cloudera.cnf.j2 b/roles/infrastructure/rdbms/templates/cloudera.cnf
similarity index 100%
rename from roles/infrastructure/rdbms/templates/cloudera.cnf.j2
rename to roles/infrastructure/rdbms/templates/cloudera.cnf
diff --git a/roles/infrastructure/rdbms/vars/mariadb.yml b/roles/infrastructure/rdbms/vars/mariadb.yml
index 27c2287c..6d6dc3d9 100644
--- a/roles/infrastructure/rdbms/vars/mariadb.yml
+++ b/roles/infrastructure/rdbms/vars/mariadb.yml
@@ -16,5 +16,5 @@
 mysql_pid_file: /var/run/mariadb/mariadb.pid
 mysql_innodb_large_prefix: 0
 mysql_config_include_files:
-  - src: "{{ local_temp_dir }}/cloudera.cnf"
+  - src: "cloudera.cnf"
     force: true