Browse Source

Revert "Merge pull request #38 from Lirt/fix/broken-mysql-dependency/#35"

This reverts commit 73fe802ded9054d2a9e18f83b163565ff425a9b3, reversing
changes made to 13c9ec76aa.
revert-bumpto57-2
Petr Michalec 7 years ago
parent
commit
c85c6a8992
No account linked to committer's email address
2 changed files with 5 additions and 11 deletions
  1. +4
    -4
      galera/map.jinja
  2. +1
    -7
      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.7', 'galera-3', 'rsync', 'python-mysqldb', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.6', '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.7', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.6', '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.7', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.6', '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.7', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient-dev', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
'pkgs': ['mysql-wsrep-5.6', '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
- 7
tests/pillar/repo_galeracluster.sls View File

enabled: true enabled: true
repo: repo:
galeracluster: galeracluster:
source: 'deb http://releases.galeracluster.com/galera-3/ubuntu {{ grains.get('oscodename') }} main'
key_id: BC19DDBA
key_server: hkp://p80.pool.sks-keyservers.net:80
mysql-wsrep:
source: 'deb http://releases.galeracluster.com/mysql-wsrep-5.7/ubuntu {{ grains.get('oscodename') }} main'
source: 'deb http://releases.galeracluster.com/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:
source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/mitaka-staging/ubuntu trusty main" source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/mitaka-staging/ubuntu trusty main"
key_id: 8A6844A29F68104E
key_server: hkp://p80.pool.sks-keyservers.net:80

Loading…
Cancel
Save