From 6638ca16b1400296b4ca6dbc03ad9393a64909db Mon Sep 17 00:00:00 2001 From: Emilien Mantel Date: Fri, 23 Sep 2016 10:18:28 +0200 Subject: [PATCH] [GALERA] Fix galera name for vagrant --- Vagrantfile | 6 +++--- tests/gen.pl | 12 +++++++----- tests/group_vars/{mariadb_galera => mariadbgalera} | 0 ...iadb_galera-1 => jessie-upstream-mariadbgalera-1} | 0 ...iadb_galera-2 => jessie-upstream-mariadbgalera-2} | 0 ...iadb_galera-3 => jessie-upstream-mariadbgalera-3} | 0 6 files changed, 10 insertions(+), 8 deletions(-) rename tests/group_vars/{mariadb_galera => mariadbgalera} (100%) rename tests/host_vars/{jessie-default-mariadb_galera-1 => jessie-upstream-mariadbgalera-1} (100%) rename tests/host_vars/{jessie-default-mariadb_galera-2 => jessie-upstream-mariadbgalera-2} (100%) rename tests/host_vars/{jessie-default-mariadb_galera-3 => jessie-upstream-mariadbgalera-3} (100%) diff --git a/Vagrantfile b/Vagrantfile index ce9bb47..c0f4bf3 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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| diff --git a/tests/gen.pl b/tests/gen.pl index dd8b8aa..96440b8 100755 --- a/tests/gen.pl +++ b/tests/gen.pl @@ -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); diff --git a/tests/group_vars/mariadb_galera b/tests/group_vars/mariadbgalera similarity index 100% rename from tests/group_vars/mariadb_galera rename to tests/group_vars/mariadbgalera diff --git a/tests/host_vars/jessie-default-mariadb_galera-1 b/tests/host_vars/jessie-upstream-mariadbgalera-1 similarity index 100% rename from tests/host_vars/jessie-default-mariadb_galera-1 rename to tests/host_vars/jessie-upstream-mariadbgalera-1 diff --git a/tests/host_vars/jessie-default-mariadb_galera-2 b/tests/host_vars/jessie-upstream-mariadbgalera-2 similarity index 100% rename from tests/host_vars/jessie-default-mariadb_galera-2 rename to tests/host_vars/jessie-upstream-mariadbgalera-2 diff --git a/tests/host_vars/jessie-default-mariadb_galera-3 b/tests/host_vars/jessie-upstream-mariadbgalera-3 similarity index 100% rename from tests/host_vars/jessie-default-mariadb_galera-3 rename to tests/host_vars/jessie-upstream-mariadbgalera-3