Skip to content

Commit 3ae5f9f

Browse files
committed
code rafactoring
1 parent 83e5deb commit 3ae5f9f

File tree

11 files changed

+5
-322
lines changed

11 files changed

+5
-322
lines changed

files/mysql-clients.cnf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# These groups are read by MariaDB command-line tools
2+
# These groups are read by Percona command-line tools
33
# Use it for options that affect only one utility
44
#
55
[mysql]

files/proxysql

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/bash
22
#
33
# chkconfig: 345 99 01
44
# description: High Performance and Advanced Proxy for MySQL and forks. \
@@ -48,7 +48,6 @@ getpid() {
4848
fi
4949
}
5050

51-
5251
testpid() {
5352
pid=`ps -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
5453
if [ "X$pid" = "X" ]
@@ -161,7 +160,6 @@ stop() {
161160
fi
162161
}
163162

164-
165163
status() {
166164
getpid
167165
if [ "X$pid" = "X" ]
@@ -200,4 +198,3 @@ case "$1" in
200198
;;
201199
esac
202200
exit $?
203-

manifests/init.pp

+1-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
# default: monitor
8888
#
8989
# [*other_pkgs*] <Array>
90-
# list of packages needed by MariaDB Galera
90+
# list of packages needed by Percona Cluster
9191
#
9292
# [*root_password*]
9393
# MySQL root password
@@ -148,7 +148,6 @@
148148
$proxysql_version = $::galera_maxscale::params::proxysql_version,
149149
$proxysql_vip = $::galera_maxscale::params::proxysql_vip,
150150
$proxysql_password = $::galera_maxscale::params::proxysql_password,
151-
$proxysql_major_version = $::galera_maxscale::params::proxysql_major_version,
152151

153152
# proxysql Keepalive configuration
154153
$network_interface = ::galera_maxscale::params::network_interface,

manifests/maxscale/firewall.pp

-23
This file was deleted.

manifests/maxscale/keepalived.pp

-56
This file was deleted.

manifests/maxscale/maxscale.pp

-128
This file was deleted.

manifests/maxscale/repo.pp

-53
This file was deleted.

manifests/params.pp

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
$proxysql_version = 'latest'
3939
$proxysql_vip = undef
4040
$proxysql_password = undef
41-
$proxysql_major_version = '2.1.13'
4241

4342
# proxysql Keepalive configuration
4443
$network_interface = 'eth0'
@@ -49,5 +48,4 @@
4948
$manage_repo = true
5049
$proxysql_hosts = undef
5150

52-
5351
}

manifests/proxysql/proxysql.pp

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#
3131
class galera_maxscale::proxysql::proxysql (
3232
$percona_major_version = $::galera_maxscale::params::percona_major_version,
33-
$proxysql_major_version = $::galera_maxscale::params::proxysql_major_version,
3433
$galera_hosts = $::galera_maxscale::params::galera_hosts,
3534
$manage_repo = $::galera_maxscale::params::manage_repo,
3635
$proxysql_hosts = $::galera_maxscale::params::proxysql_hosts,

templates/maxscale.cnf.erb

-49
This file was deleted.

0 commit comments

Comments
 (0)