summaryrefslogtreecommitdiff
path: root/salt/openbook
diff options
context:
space:
mode:
Diffstat (limited to 'salt/openbook')
-rw-r--r--salt/openbook/ansible/files/mariadb.list2
-rw-r--r--salt/openbook/ansible/files/mysql_client.yaml4
-rw-r--r--salt/openbook/database/files/debconfrc4
-rw-r--r--salt/openbook/database/files/installdeps.sh4
-rw-r--r--salt/openbook/database/files/start_galera_node.sh2
5 files changed, 8 insertions, 8 deletions
diff --git a/salt/openbook/ansible/files/mariadb.list b/salt/openbook/ansible/files/mariadb.list
index b357315..9d4b9da 100644
--- a/salt/openbook/ansible/files/mariadb.list
+++ b/salt/openbook/ansible/files/mariadb.list
@@ -1 +1 @@
-deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main
+deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu xenial main
diff --git a/salt/openbook/ansible/files/mysql_client.yaml b/salt/openbook/ansible/files/mysql_client.yaml
index 6ee58be..72e0357 100644
--- a/salt/openbook/ansible/files/mysql_client.yaml
+++ b/salt/openbook/ansible/files/mysql_client.yaml
@@ -27,14 +27,14 @@
pkg: "{{ item }}"
state: present
with_items:
- - mariadb-client-10.1
+ - mariadb-client-10.2
when: ansible_distribution == "Ubuntu"
- name: "Add mariadb repository"
yum_repository:
name: MariaDB
description: MariaDB
- baseurl: http://yum.mariadb.org/10.1/centos7-amd64
+ baseurl: http://yum.mariadb.org/10.2/centos7-amd64
gpgkey: https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
when: ansible_distribution == "RedHat" or ansible_distribution == "CentOS"
diff --git a/salt/openbook/database/files/debconfrc b/salt/openbook/database/files/debconfrc
index 689cd64..b848278 100644
--- a/salt/openbook/database/files/debconfrc
+++ b/salt/openbook/database/files/debconfrc
@@ -1,2 +1,2 @@
-mariadb-server-10.1 mysql-server/root_password password {% raw %}{{ openbook_database_password }}{% endraw %}
-mariadb-server-10.1 mysql-server/root_password_again password {% raw %}{{ openbook_database_password }}{% endraw %}
+mariadb-server-10.2 mysql-server/root_password password {% raw %}{{ openbook_database_password }}{% endraw %}
+mariadb-server-10.2 mysql-server/root_password_again password {% raw %}{{ openbook_database_password }}{% endraw %}
diff --git a/salt/openbook/database/files/installdeps.sh b/salt/openbook/database/files/installdeps.sh
index 2575726..e71a4ae 100644
--- a/salt/openbook/database/files/installdeps.sh
+++ b/salt/openbook/database/files/installdeps.sh
@@ -5,10 +5,10 @@ apt-get update
apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade
apt-get -y install software-properties-common
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
-add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu xenial main'
+add-apt-repository 'deb [arch=amd64,i386] http://sgp1.mirrors.digitalocean.com/mariadb/repo/10.2/ubuntu xenial main'
apt-get update
apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade
-apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.1 xinetd
+apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install curl python netcat mariadb-server-10.2 xinetd
service mysql stop
service xinetd stop
diff --git a/salt/openbook/database/files/start_galera_node.sh b/salt/openbook/database/files/start_galera_node.sh
index 3746a0d..8360683 100644
--- a/salt/openbook/database/files/start_galera_node.sh
+++ b/salt/openbook/database/files/start_galera_node.sh
@@ -5,7 +5,7 @@ if [ ! -d "{{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}/mysql" ]; t
export DEBIAN_FRONTEND=noninteractive
. /etc/profile
debconf-set-selections /etc/mysql/conf.d/debconfrc
- dpkg-reconfigure mariadb-server-10.1
+ dpkg-reconfigure mariadb-server-10.2
fi
/etc/mysql/bin/fix_permissions.sh &