Merge branch 'glendale' into hollywood

2 files changed, 0 insertions, 36 deletions

diff --git a/scripts/VyattaClusterConfig.pm b/scripts/VyattaClusterConfig.pm
index ab5b536..01979dc 100644
--- a/scripts/VyattaClusterConfig.pm
+++ b/scripts/VyattaClusterConfig.pm
@@ -348,37 +348,6 @@ EOS
   return ($str, undef, @init_services);
 }
 
-sub del_watchlink_exclude {
-  my $self = shift;
-  my $cmd = '/opt/vyatta/sbin/vyatta-watchlink-exclude.pl '
-            . "--id=$HA_WATCHLINK_ID --action=remove >&/dev/null";
-  system($cmd);
-}
-
-sub add_watchlink_exclude {
-  my $self = shift;
-  my $bcmd = '/opt/vyatta/sbin/vyatta-watchlink-exclude.pl '
-             . "--id=$HA_WATCHLINK_ID --action=add --intf='*'";
-  my @groups = keys %{$self->{_groups}};
-  my $hashref = $self->{_groups}->{$groups[0]};
-  my @ip_addresses = ();
-  foreach (@{$hashref->{_service}}) {
-    if (isValidIPSpec($_)) {
-      my $ip = (/^([^\/]+)\//) ? $1 : $_;
-      push @ip_addresses, $ip;
-    }
-  }
-  return if (scalar(@ip_addresses) <= 0);
-
-  my $last_ip = pop @ip_addresses;
-  foreach (@ip_addresses) {
-    my $cmd = "$bcmd --ipadd=$_";
-    system($cmd);
-  }
-  my $cmd = "$bcmd --ipadd=$last_ip --signal";
-  system($cmd);
-}
-
 sub print_str {
   my ($self) = @_;
   my $str = "cluster";
diff --git a/scripts/vyatta-update-cluster.pl b/scripts/vyatta-update-cluster.pl
index 5dcdc47..dbe4b74 100755
--- a/scripts/vyatta-update-cluster.pl
+++ b/scripts/vyatta-update-cluster.pl
@@ -15,8 +15,6 @@ if ($config->isEmpty()) {
   # shutdown clustering.
   system("$HA_INIT stop");
   
-  $config->del_watchlink_exclude();
-
   exit 0;
 }
 
@@ -68,9 +66,6 @@ if (!chmod(0600, "$HA_DIR/authkeys")) {
   exit 1;
 }
 
-$config->del_watchlink_exclude();
-$config->add_watchlink_exclude();
-
 # stop each service in case it is already started
 foreach (@init_services) {
   system("$SERVICE_DIR/$_ stop");