openstack/trove-integration
Code Issues Proposed changes

Merge "MariaDB 10 Elements"

Browse Source
This commit is contained in:
Jenkins
2016-01-29 19:22:27 +00:00
committed by Gerrit Code Review
parent 2465b2f059 7872c7d7a7
commit c44d8e700b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/files/elements/ubuntu-mariadb/install.d/30-mariadb
View File

@@ -12,7 +12,7 @@ export DEBIAN_FRONTEND=noninteractive
# https://mariadb.com/kb/en/mariadb/installing-mariadb-deb-files/
apt-get -y install software-properties-common
apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu trusty main'
add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu trusty main'
# Pin MariaDB repository
sudo echo -e "Package: *\nPin: origin ftp.osuosl.org\nPin-Priority: 1000" > /etc/apt/preferences.d/mariadb.pref