Merge pull request #262 from noelmcloughlin/pycent7

fix(centos7): add correct pymysql package on cent7/saltpy3

.yamllint

@@ -22,6 +22,7 @@ ignore: |
   .kitchen/
   kitchen.vagrant.yml
   mysql/supported_sections.yaml
+  mysql/osfingermap.yaml
 
 yaml-files:
   # Default settings

mysql/osfingermap.yaml

@@ -71,7 +71,11 @@ CentOS-6:
   pythonpkg: MySQL-python
 CentOS Linux-7:
   # https://mariadb.com/blog/rhel7-transition-mysql-mariadb-first-look
+      {%- if 'pythonversion' in grains and grains.pythonversion[0]|int == 3 %}
+  pythonpkg: python36-PyMySQL   # python36-mysql works too
+      {%- else %}
   pythonpkg: MySQL-python
+      {%- endif %}
   serverpkg: mariadb-server
   service: mariadb
   clientpkg: mariadb

test/integration/default/controls/packages_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-# Override by OS
+# Override by OS.
 package_name = 'mariadb-server'
 if (os[:name] == 'suse') || (os[:name] == 'opensuse')
   package_name = 'mariadb'
-elsif (os[:name] == 'debian') && os[:release].start_with?('8')
+elsif os[:release].start_with?('8') && %w[debian centos].include?(os[:name])
   package_name = 'mysql-server'
 end
 

test/salt/pillar/mysql.sls

@@ -30,9 +30,10 @@ mysql:
     mysqld:
       # you can use either underscore or hyphen in param names
       bind-address: 0.0.0.0
-      log_bin: /var/log/mysql/mysql-bin.log
+      # log_bin: /var/log/mysql/mysql-bin.log
       datadir: /var/lib/mysql
-      port: 3307
+      # port: 3307
+      # plugin-load-add: auth_socket.so
       binlog_do_db: foo
       auto_increment_increment: 5
       binlog-ignore-db:
@@ -112,8 +113,6 @@ mysql:
         - database: foo
           grants: ['select', 'insert', 'update']
           escape: true
-        - database: bar
-          grants: ['all privileges']
     # bob:
     #   password_hash: '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
     #   host: '%' # Any host
@@ -136,7 +135,7 @@ mysql:
     #       grants: ['select', 'insert', 'update', 'delete']
     nopassuser:
       password: ~
-      host: localhost
+      # host: localhost  # requires unix_socket plugin
       databases: []
     application:
       password: 'somepass'