removed cloudera.cnf mysql cnf template evaluation as collection does…

… this for us Signed-off-by: William Dyson <wdyson@cloudera.com>
cloudera-labs · Mar 1, 2022 · f0c6305 · f0c6305
1 parent a4f2e72
commit f0c6305
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 29 deletions.
diff --git 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
@@ -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
diff --git a/...structure/rdbms/templates/cloudera.cnf.j2 → ...frastructure/rdbms/templates/cloudera.cnf b/...structure/rdbms/templates/cloudera.cnf.j2 → ...frastructure/rdbms/templates/cloudera.cnf
diff --git 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