diff options
| -rw-r--r-- | jjb/yaml/openbook-all-pipeline.yaml | 2 | ||||
| -rw-r--r-- | jjb/yaml/openbook-core-pipeline.yaml | 2 | ||||
| -rw-r--r-- | jjb/yaml/openbook-pipeline.yaml | 2 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/mariadb.list | 2 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/mysql_client.yaml | 4 | ||||
| -rw-r--r-- | salt/openbook/database/files/debconfrc | 4 | ||||
| -rw-r--r-- | salt/openbook/database/files/installdeps.sh | 4 | ||||
| -rw-r--r-- | salt/openbook/database/files/start_galera_node.sh | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/jjb/yaml/openbook-all-pipeline.yaml b/jjb/yaml/openbook-all-pipeline.yaml index c5e3283..b7b79a3 100644 --- a/jjb/yaml/openbook-all-pipeline.yaml +++ b/jjb/yaml/openbook-all-pipeline.yaml @@ -22,7 +22,7 @@ scm: [ $class: "GitSCM", branches: [ - [name: "master"] + [name: "unstable"] ], userRemoteConfigs: [ [url: "git@github.com:Talligent/openbook-core.git"] diff --git a/jjb/yaml/openbook-core-pipeline.yaml b/jjb/yaml/openbook-core-pipeline.yaml index 7a06acf..a7fa153 100644 --- a/jjb/yaml/openbook-core-pipeline.yaml +++ b/jjb/yaml/openbook-core-pipeline.yaml @@ -25,7 +25,7 @@ scm: [ $class: "GitSCM", branches: [ - [name: "master"] + [name: "unstable"] ], userRemoteConfigs: [ [url: "git@github.com:Talligent/openbook-core.git"] diff --git a/jjb/yaml/openbook-pipeline.yaml b/jjb/yaml/openbook-pipeline.yaml index 0c5f490..f0fcfc3 100644 --- a/jjb/yaml/openbook-pipeline.yaml +++ b/jjb/yaml/openbook-pipeline.yaml @@ -32,7 +32,7 @@ scm: [ $class: "GitSCM", branches: [ - [name: "master"] + [name: "unstable"] ], userRemoteConfigs: [ [url: "git@github.com:Talligent/{artifact}.git"] 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 & |