From 9deaba8be9e34c5e5ba6b03e73d5de361659fd1a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 3 Dec 2018 20:20:57 -0500 Subject: [PATCH] Mysql Module - Change to new docker --- salt/mysql/init.sls | 2 +- so-setup-network.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index d5a48eff1..f4b9ad03f 100644 --- a/salt/mysql/init.sls +++ b/salt/mysql/init.sls @@ -43,7 +43,7 @@ mysqldatadir: so-mysql: docker_container.running: - - image: mysql/mysql-server:5.7 + - image: soshybridhunter/so-mysql:HH1.0.5 - hostname: so-mysql - user: socore - port_bindings: diff --git a/so-setup-network.sh b/so-setup-network.sh index aef893040..b44af1c57 100644 --- a/so-setup-network.sh +++ b/so-setup-network.sh @@ -170,6 +170,10 @@ configure_minion() { if [ $TYPE == 'master' ] || [ $TYPE == 'eval' ]; then echo "master: $HOSTNAME" > /etc/salt/minion echo "id: $HOSTNAME" >> /etc/salt/minion + echo "mysql.host: '$MAINIP'" >> /etc/salt/minion + echo "mysql.port: 3306" >> /etc/salt/minion + echo "mysql.user: 'root'" >> /etc/salt/minion + echo "mysql.pass: '$MYSQLPASS'" >> /etc/salt/minion else echo "master: $MSRV" > /etc/salt/minion echo "id: $HOSTNAME" >> /etc/salt/minion