add mariadb good package in debconf

opensource-expert · May 12, 2016 · 8033711 · 8033711
1 parent ab8244b
commit 8033711
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/mysql/mariadb/init.sls b/mysql/mariadb/init.sls
@@ -43,7 +43,7 @@ extend:
     file.managed:
       - unless:
         - echo
-  mysql_debconf:
-    debconf.set:
-      - unless:
-        - echo
+  #mysql_debconf:
+  #  debconf.set:
+  #    - unless:
+  #      - echo
diff --git a/mysql/server.sls b/mysql/server.sls
@@ -1,3 +1,4 @@
+# vim: set ft=yaml:
 include:
   - mysql.config
   - mysql.python
@@ -21,11 +22,11 @@ mysql_debconf_utils:
 
 mysql_debconf:
   debconf.set:
-    - name: {{ mysql.server }}
+    - name: {{ mysql.debconf_package }}
     - data:
-        '{{ mysql.server }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'}
-        '{{ mysql.server }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'}
-        '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'}
+        '{{ mysql.debconf }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'}
+        '{{ mysql.debconf }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'}
+        '{{ mysql.debconf }}/start_on_boot': {'type': 'boolean', 'value': 'true'}
     - require_in:
       - pkg: {{ mysql.server }}
     - require:

diff --git a/mysql/user.sls b/mysql/user.sls
@@ -1,3 +1,4 @@
+# vim: set ft=yaml:
 {% from "mysql/defaults.yaml" import rawmap with context %}
 {%- set mysql = salt['grains.filter_by'](rawmap, grain='os', merge=salt['pillar.get']('mysql:server:lookup')) %}
 {%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}