Merge pull request #21 from TOoSmOotH/master

Fix an upstream issue with python-docker

salt/mysql/etc/my.cnf

@@ -22,10 +22,10 @@ skip-name-resolve
 datadir=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
 secure-file-priv=/var/lib/mysql-files
-user=mysql
+user=939
 
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links=0
 
-log-error=/var/log/mysqld.log
+log-error=/var/log/mysql/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid

salt/mysql/etc/mypass

@@ -0,0 +1,2 @@
+{%- set MYSQLPASS = salt['pillar.get']('master:mysqlpass', 'iwonttellyou') %}
+{{ MYSQLPASS }}

salt/mysql/init.sls

@@ -1,7 +1,77 @@
+{%- set MYSQLPASS = salt['pillar.get']('master:mysqlpass', 'iwonttellyou') %}
+{%- set FLEETPASS = salt['pillar.get']('master:fleetpass', 'bazinga') %}
+{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
 # MySQL Setup
-filebeatetcdir:
+mysqlpkgs:
+  pkg.installed:
+    - skip_suggestions: False
+    - pkgs:
+      {% if grains['os'] != 'CentOS' %}
+      - python-mysqldb
+      {% else %}
+      - MySQL-python
+      {% endif %}
+
+mysqletcdir:
   file.directory:
     - name: /opt/so/conf/mysql/etc
     - user: 939
     - group: 939
     - makedirs: True
+
+lsetcsync:
+  file.recurse:
+    - name: /opt/so/conf/mysql/etc
+    - source: salt://mysql/etc
+    - user: 939
+    - group: 939
+    - template: jinja
+
+mysqllogdir:
+  file.directory:
+    - name: /opt/so/log/mysql
+    - user: 939
+    - group: 939
+    - makedirs: True
+
+mysqldatadir:
+  file.directory:
+    - name: /nsm/mysql
+    - user: 939
+    - group: 939
+    - makedirs: True
+
+so-mysql:
+  docker_container.running:
+    - image: mysql/mysql-server:5.7
+    - hostname: so-mysql
+    - user: socore
+    - port_bindings:
+      - 0.0.0.0:3306:3306
+    - environment:
+      - MYSQL_ROOT_HOST={{ MASTERIP }}
+      - MYSQL_ROOT_PASSWORD=/etc/mypass
+    - binds:
+      - /opt/so/conf/etc/my.cnf:/etc/my.cnf:ro
+      - /opt/so/conf/etc/mypass:/etc/mypass
+      - /nsm/mysql:/var/lib/mysql:rw
+      - /opt/so/log/mysql:/var/log/mysql:rw
+    - watch:
+      - /opt/so/conf/mysql/etc
+
+fleetdb:
+  mysql_database.present:
+    - name: fleet
+
+fleetdbuser:
+  mysql_user.present:
+    - host: {{ MASTERIP }}
+    - password: {{ FLEETPASS }}
+    - connection_user: root
+    - connection_pass: {{ MYSQLPASS }}
+
+fleetdbpriv:
+  mysql_grants.present:
+    - grant: all privileges
+    - database: fleet.*
+    - user: fleet

so-setup-network.sh

@@ -328,7 +328,7 @@ docker_install() {
     yum -y install yum-utils device-mapper-persistent-data lvm2 openssl
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
-    yum -y install docker-ce python-docker
+    yum -y install docker-ce docker-python python-docker
 
   else
     if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then