salt
/
galera-formula
forked from ExternalMirrors/galera-formula
Watch 1
Star 0
Fork 0
Code Releases 7 Activity
Browse Source

Bump mysql wsrep repository and packages to 5.7. #35 

This patch fixes broken dependencies installed via
python-mysqldb which needs mysql-common-5.7.

Signed-off-by: Ondrej Vasko <ondrej.vaskoo@gmail.com>
revert-bumpto57-2
Ondrej Vasko 7 years ago
parent
abe03d24b5
commit
1879a9ab36
2 changed files with 5 additions and 5 deletions
Unified View Show Diff Stats
  1. +4
    -4
      galera/map.jinja
  2. +1
    -1
      tests/pillar/repo_galeracluster.sls

+ 4
- 4
galera/map.jinja View File

'innodb_buffer_pool_size': '3138M', 'innodb_buffer_pool_size': '3138M',
}, },
'Debian': { 'Debian': {
'pkgs': ['mysql-wsrep-5.6', 'galera-3', 'rsync', 'python-mysqldb', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.7', 'galera-3', 'rsync', 'python-mysqldb', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'service': 'mysql', 'service': 'mysql',
'wsrep_provider': '/usr/lib/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
'log_file': '/var/log/mysql.log', 'log_file': '/var/log/mysql.log',
'innodb_buffer_pool_size': '3138M', 'innodb_buffer_pool_size': '3138M',
}, },
'Debian': { 'Debian': {
'pkgs': ['mysql-wsrep-5.6', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.7', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'service': 'mysql', 'service': 'mysql',
'wsrep_provider': '/usr/lib/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
'log_file': '/var/log/mysql.log', 'log_file': '/var/log/mysql.log',
}, },
}, merge=salt['grains.filter_by']({ }, merge=salt['grains.filter_by']({
'trusty': { 'trusty': {
'pkgs': ['mysql-wsrep-5.6', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.7', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'service': 'mysql', 'service': 'mysql',
'wsrep_provider': '/usr/lib/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
'log_file': '/var/log/mysql.log', 'log_file': '/var/log/mysql.log',
'config': '/etc/mysql/my.cnf', 'config': '/etc/mysql/my.cnf',
}, },
'xenial': { 'xenial': {
'pkgs': ['mysql-wsrep-5.6', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient-dev', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.7', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient-dev', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'service': 'mysql', 'service': 'mysql',
'wsrep_provider': '/usr/lib/galera/libgalera_smm.so', 'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
'log_file': '/var/log/mysql.log', 'log_file': '/var/log/mysql.log',

+ 1
- 1
tests/pillar/repo_galeracluster.sls View File

key_id: BC19DDBA key_id: BC19DDBA
key_server: hkp://p80.pool.sks-keyservers.net:80 key_server: hkp://p80.pool.sks-keyservers.net:80
mysql-wsrep: mysql-wsrep:
source: 'deb http://releases.galeracluster.com/mysql-wsrep-5.6/ubuntu {{ grains.get('oscodename') }} main'
source: 'deb http://releases.galeracluster.com/mysql-wsrep-5.7/ubuntu {{ grains.get('oscodename') }} main'
key_id: BC19DDBA key_id: BC19DDBA
key_server: hkp://p80.pool.sks-keyservers.net:80 key_server: hkp://p80.pool.sks-keyservers.net:80
mitaka-staging_PPA: mitaka-staging_PPA:

Write Preview
Loading…
Cancel
Save