From 80202dbb07c9af3db0acc30e92ab2c3993c3a156 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 16:32:40 -0500 Subject: [PATCH 1/6] MySQL Module - First BIG checkin --- salt/mysql/etc/my.cnf | 4 +-- salt/mysql/etc/mypass | 2 ++ salt/mysql/init.sls | 71 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 salt/mysql/etc/mypass diff --git a/salt/mysql/etc/my.cnf b/salt/mysql/etc/my.cnf index bbcee564d..e1bf4e117 100644 --- a/salt/mysql/etc/my.cnf +++ b/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 diff --git a/salt/mysql/etc/mypass b/salt/mysql/etc/mypass new file mode 100644 index 000000000..723d4722f --- /dev/null +++ b/salt/mysql/etc/mypass @@ -0,0 +1,2 @@ +{%- set MYSQLPASS = salt['pillar.get']('master:mysqlpass', 'iwonttellyou') %} +{{ MYSQLPASS }} diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 1c8464167..3054e70a6 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -1,7 +1,76 @@ +{%- set MYSQLPASS = salt['pillar.get']('master:mysqlpass', 'iwonttellyou') %} +{%- set FLEETPASS = salt['pillar.get']('master:fleetpass', 'bazinga') %} # 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 + +mysqletcdir: + 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: soshybridhunter/so-redis:HH1.0.3 + - 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 From 5192dc333711637c9cdadc0ed85490db5c927d66 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 16:39:02 -0500 Subject: [PATCH 2/6] MySQL Module - AddMASTERIP entry --- salt/mysql/init.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 3054e70a6..d3f3a8d49 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -1,5 +1,6 @@ {%- 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 mysqlpkgs: pkg.installed: From 1d0f045fd107a71e965f2584e9973d358d5d3e1e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 16:44:01 -0500 Subject: [PATCH 3/6] MySQL Module - Fix name mismatch --- salt/mysql/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index d3f3a8d49..2c7e27350 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -27,7 +27,7 @@ lsetcsync: - group: 939 - template: jinja -mysqletcdir: +mysqllogdir: file.directory: - name: /opt/so/log/mysql - user: 939 From a781da2c966884befca5eba19027165396fc9f90 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 16:51:34 -0500 Subject: [PATCH 4/6] MySQL Module - Change to correct image --- salt/mysql/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 2c7e27350..d5a48eff1 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -43,7 +43,7 @@ mysqldatadir: so-mysql: docker_container.running: - - image: soshybridhunter/so-redis:HH1.0.3 + - image: mysql/mysql-server:5.7 - hostname: so-mysql - user: socore - port_bindings: From 647e7826870c36e44f7b51c642295428b2c5f3f9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 16:57:38 -0500 Subject: [PATCH 5/6] Setup Script - Fix Python --- so-setup-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index d7c6e8891..de0d01f9a 100644 --- a/so-setup-network.sh +++ b/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 else if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then From 291e3b20f0531c647e7fea2ebc5e1cbc2df40e1b Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 17:04:35 -0500 Subject: [PATCH 6/6] Setup Script - Fix Python --- so-setup-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/so-setup-network.sh b/so-setup-network.sh index de0d01f9a..aef893040 100644 --- a/so-setup-network.sh +++ b/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 docker-python + yum -y install docker-ce docker-python python-docker else if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then