[GALERA] Fix galera name for vagrant

pull/14/head
Emilien Mantel 2016-09-23 10:18:28 +02:00
parent d6173bd9b5
commit 6638ca16b1
6 changed files with 10 additions and 8 deletions

6
Vagrantfile vendored
View File

@ -14,9 +14,9 @@ Vagrant.configure("2") do |config|
["jessie-upstream-percona-slave", "debian/jessie64", "192.168.200.15", ["jessie","upstream","percona","slave"]],
["jessie-default-mariadb-master", "debian/jessie64", "192.168.200.16", ["jessie","default","mariadb","master"]],
["jessie-default-mariadb-slave", "debian/jessie64", "192.168.200.17", ["jessie","default","mariadb","slave"]],
["jessie-default-mariadb_galera-1", "debian/jessie64", "192.168.200.18", ["jessie","default","mariadb_galera","1"]],
["jessie-default-mariadb_galera-2", "debian/jessie64", "192.168.200.19", ["jessie","default","mariadb_galera","2"]],
["jessie-default-mariadb_galera-3", "debian/jessie64", "192.168.200.20", ["jessie","default","mariadb_galera","3"]]
["jessie-upstream-mariadbgalera-1", "debian/jessie64", "192.168.200.18", ["jessie","upstream","mariadbgalera","1"]],
["jessie-upstream-mariadbgalera-2", "debian/jessie64", "192.168.200.19", ["jessie","upstream","mariadbgalera","2"]],
["jessie-upstream-mariadbgalera-3", "debian/jessie64", "192.168.200.20", ["jessie","upstream","mariadbgalera","3"]]
]
config.vm.provider "virtualbox" do |v|

View File

@ -17,9 +17,9 @@ my @a = (
"jessie-upstream-percona-slave",
"jessie-default-mariadb-master",
"jessie-default-mariadb-slave",
"jessie-default-mariadb_galera-1",
"jessie-default-mariadb_galera-2",
"jessie-default-mariadb_galera-3"
"jessie-upstream-mariadbgalera-1",
"jessie-upstream-mariadbgalera-2",
"jessie-upstream-mariadbgalera-3"
);
my $start_ip = '192.168.200.10';
@ -44,7 +44,7 @@ foreach my $n (@a)
close(FILE);
}
if($data[-1] =~ /^\d$/ && $data[-2] eq 'mariadb_galera')
if($data[-1] =~ /^\d$/ && $data[-2] eq 'mariadbgalera')
{
open(FILE, '>', "host_vars/$n");
printf FILE (qq/galera_id: '%s'\n/, $data[-1]);
@ -52,7 +52,9 @@ foreach my $n (@a)
}
open(FILE, '>', "group_vars/" . $data[2]);
printf FILE (qq/mysql_vendor: '%s'\n/, $data[2]);
my $mv = $data[-2];
$mv = 'mariadb_galera' if($mv eq 'mariadbgalera');
printf FILE (qq/mysql_vendor: '%s'\n/, $mv);
close(FILE);
$tmp_ip = long2ip($iip);