PNDA-4774 Additional MySQL instance deployed for no reason

pndaproject · Jul 12, 2018 · adce572 · adce572
1 parent 8adf3c4
commit adce572
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/pillar/packages/CentOS.sls b/pillar/packages/CentOS.sls
@@ -76,6 +76,9 @@ mysql-server:
   version: "5.5.58-2.el7"
   configuration_file: /etc/my.cnf
   service_name: mysqld
+mysql-client:
+  package-name: mysql-community-client
+  version: "5.5.60-2.el7"
 nginx:
   package-name: nginx
   version: ""

diff --git a/pillar/packages/RedHat.sls b/pillar/packages/RedHat.sls
@@ -76,6 +76,9 @@ mysql-server:
   version: "5.5.54-2.el7"
   configuration_file: /etc/my.cnf
   service_name: mysqld
+mysql-client:
+  package-name: mysql-community-client
+  version: "5.5.60-2.el7"
 nginx:
   package-name: nginx
   version: ""

diff --git a/salt/ambari/server.sls b/salt/ambari/server.sls
@@ -12,7 +12,7 @@
 include:
   - java
   - mysql.connector
-  - mysql
+  - mysql.client
 
 ambari-server-user:
   user.present:

diff --git a/salt/cdh/cloudera-manager.sls b/salt/cdh/cloudera-manager.sls
@@ -8,7 +8,7 @@
 include:
   - java
   - mysql.connector
-  - mysql
+  - mysql.client
 
 cloudera-manager-install_daemons:
   pkg.installed:

diff --git a/salt/mysql/client.sls b/salt/mysql/client.sls
@@ -0,0 +1,10 @@
+mysql-install-python-library:
+  pkg.installed:
+    - name: {{ pillar['python-mysqldb']['package-name'] }}
+    - version: {{ pillar['python-mysqldb']['version'] }}
+    - reload_modules: True
+
+mysql-install-mysql-client:
+  pkg.installed:
+    - name: {{ pillar['mysql-client']['package-name'] }}
+    - version: {{ pillar['mysql-client']['version'] }}