diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| l--------- | ChangeLog | 1 | ||||
| -rwxr-xr-x | debian/autogen.sh | 26 | ||||
| -rw-r--r-- | debian/changelog | 44 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 6 | ||||
| -rwxr-xr-x | scripts/keepalived/vyatta-keepalived.pl | 190 |
6 files changed, 225 insertions, 43 deletions
@@ -3,7 +3,6 @@ /aclocal.m4 /autom4te.cache /build-stamp -/ChangeLog /config /config.log /config.guess diff --git a/ChangeLog b/ChangeLog new file mode 120000 index 00000000..d526672c --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +debian/changelog
\ No newline at end of file diff --git a/debian/autogen.sh b/debian/autogen.sh index ff125d1d..e8c94af8 100755 --- a/debian/autogen.sh +++ b/debian/autogen.sh @@ -1,32 +1,6 @@ #!/bin/sh -if [ -d .git ] ; then -# generate GNU/Debian format ChangeLog from git log - - rm -f ChangeLog - - if which git2cl >/dev/null ; then - git-log --pretty --numstat --summary | git2cl >> ChangeLog - else - git-log --pretty=short >> ChangeLog - fi - -# append repository reference - - url=` git repo-config --get remote.origin.url` - test "x$url" = "x" && url=`pwd` - - branch=`git-branch --no-color | sed '/^\* /!d; s/^\* //'` - test "x$branch" = "x" && branch=master - - sha=`git log --pretty=oneline --no-color -n 1 | cut -c-8` - test "x$sha" = "x" && sha=00000000 - - echo "$url#$branch-$sha" >> ChangeLog - -fi - rm -rf config rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL diff --git a/debian/changelog b/debian/changelog index 263a6f69..bd9e876e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,47 @@ +vyatta-cfg-system (0.9) unstable; urgency=low + + 3.0.5 + + + -- Mark O'Brien <mobrien@vyatta.com> Tue, 06 May 2008 12:43:15 -0700 + +vyatta-cfg-system (0.8) unstable; urgency=low + + 3.0.4 + [ Mark O'Brien ] + + + [ An-Cheng Huang ] + * fix for bug 3225: only insert sudoers if not present. + + [ Stig Thormodsrud ] + * Mimic the transaction mechanism to only restart the vrrp daemon + once/commit. + + [ rbalocca ] + * config.boot.default is not moved to the top level repo (build- + iso.git) + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@vyatta.com> Mon, 05 May 2008 16:40:35 -0700 + +vyatta-cfg-system (0.7) unstable; urgency=low + + 3.0.3 + [ Mark O'Brien ] + + + [ Stephen Hemminger ] + * watchlink is no longer used + + [ rbalocca ] + * Indicate the VC4.0.2 release candidate in the changelog + + [ Mark O'Brien ] + + -- Mark O'Brien <mobrien@vyatta.com> Tue, 29 Apr 2008 16:42:17 -0700 + vyatta-cfg-system (0.6) unstable; urgency=low VC4.0.2 diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 54931692..a627c4af 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -30,7 +30,9 @@ if [ "$sysconfdir" != "/etc" ]; then fi # Allow operator to do a limited number of commands without password - cat <<"EOF" >>/etc/sudoers + if ! grep -q '^%operator ALL=NOPASSWD:' /etc/sudoers; then + cat <<"EOF" >>/etc/sudoers +### BEGIN VYATTA OPERATOR COMMANDS Cmnd_Alias IPTABLES = /sbin/iptables --list -n,\ /sbin/iptables -L -vn,\ /sbin/iptables -L * -vn,\ @@ -46,7 +48,9 @@ Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff %operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH, \ PPPOE_CMDS, /usr/bin/tshark +### END VYATTA OPERATOR COMMANDS EOF + fi # for "users" level (FIXME) if ! grep -q "^%users ALL=NOPASSWD: ${bindir}/sudo-users/" /etc/sudoers; then diff --git a/scripts/keepalived/vyatta-keepalived.pl b/scripts/keepalived/vyatta-keepalived.pl index 55d53715..7389534b 100755 --- a/scripts/keepalived/vyatta-keepalived.pl +++ b/scripts/keepalived/vyatta-keepalived.pl @@ -31,8 +31,39 @@ use Getopt::Long; use strict; use warnings; +my $changes_file = '/var/log/vrrpd/changes'; +my $conf_file = VyattaKeepalived::get_conf_file(); + my %HoA_sync_groups; +sub vrrp_get_init_state { + my ($intf, $group, $vips, $preempt) = @_; + + my $init_state; + if (VyattaKeepalived::is_running()) { + my @state_files = VyattaKeepalived::get_state_files($intf, $group); + if (scalar(@state_files) > 0) { + my ($start_time, $f_intf, $f_group, $state, $ltime) = + VyattaKeepalived::vrrp_state_parse($state_files[0]); + if ($state eq "master") { + $init_state = 'MASTER'; + } else { + $init_state = 'BACKUP'; + } + return $init_state; + } + # fall through to logic below + } + + if ($preempt eq "false") { + $init_state = 'BACKUP'; + } else { + $init_state = 'MASTER'; + } + + return $init_state; +} + sub keepalived_get_values { my ($intf, $path) = @_; @@ -86,7 +117,7 @@ sub keepalived_get_values { } } - $config->setLevel("$path vrrp vrrp-group $group run-transition-scripts"); + $config->setLevel("$path vrrp vrrp-group $group run-transition-scripts"); my $run_backup_script = $config->returnValue("backup"); if(!defined $run_backup_script){ $run_backup_script = "null"; @@ -100,13 +131,9 @@ sub keepalived_get_values { $run_master_script = "null"; } - $output .= "vrrp_instance $vrrp_instance \{\n"; - if ($preempt eq "false") { - $output .= "\tstate BACKUP\n"; - } else { - $output .= "\tstate MASTER\n"; - } + my $init_state = vrrp_get_init_state($intf, $group, $vips[0], $preempt); + $output .= "\tstate $init_state\n"; $output .= "\tinterface $intf\n"; $output .= "\tvirtual_router_id $group\n"; $output .= "\tpriority $priority\n"; @@ -151,9 +178,130 @@ sub vrrp_get_sync_groups { return $output; } +sub vrrp_read_changes { + my @lines = (); + open(my $FILE, "<", $changes_file) or die "Error: read $!"; + @lines = <$FILE>; + close($FILE); + chomp @lines; + return @lines; +} + +sub vrrp_save_changes { + my @list = @_; + + my $num_changes = scalar(@list); + VyattaKeepalived::vrrp_log("saving changes file $num_changes"); + open(my $FILE, ">", $changes_file) or die "Error: write $!"; + print $FILE join("\n", @list), "\n"; + close($FILE); +} + +sub vrrp_find_changes { + + my @list = (); + my $config = new VyattaConfig; + my $vrrp_instances = 0; + + $config->setLevel("interfaces ethernet"); + my @eths = $config->listNodes(); + foreach my $eth (@eths) { + my $path = "interfaces ethernet $eth"; + $config->setLevel($path); + if ($config->exists("vrrp")) { + my %vrrp_status_hash = $config->listNodeStatus("vrrp"); + my ($vrrp, $vrrp_status) = each(%vrrp_status_hash); + if ($vrrp_status ne "static") { + push @list, $eth; + VyattaKeepalived::vrrp_log("$vrrp_status found $eth"); + } + } + if ($config->exists("vif")) { + my $path = "interfaces ethernet $eth vif"; + $config->setLevel($path); + my @vifs = $config->listNodes(); + foreach my $vif (@vifs) { + my $vif_intf = $eth . "." . $vif; + my $vif_path = "$path $vif"; + $config->setLevel($vif_path); + if ($config->exists("vrrp")) { + my %vrrp_status_hash = $config->listNodeStatus("vrrp"); + my ($vrrp, $vrrp_status) = each(%vrrp_status_hash); + if ($vrrp_status ne "static") { + push @list, "$eth.$vif"; + VyattaKeepalived::vrrp_log("$vrrp_status found $eth.$vif"); + } + } + } + } + } + + # + # Now look for deleted from the origin tree + # + $config->setLevel("interfaces ethernet"); + @eths = $config->listOrigNodes(); + foreach my $eth (@eths) { + my $path = "interfaces ethernet $eth"; + $config->setLevel($path); + if ($config->isDeleted("vrrp")) { + push @list, $eth; + VyattaKeepalived::vrrp_log("Delete found $eth"); + } + $config->setLevel("$path vif"); + my @vifs = $config->listOrigNodes(); + foreach my $vif (@vifs) { + my $vif_intf = $eth . "." . $vif; + my $vif_path = "$path vif $vif"; + $config->setLevel($vif_path); + if ($config->isDeleted("vrrp")) { + push @list, "$eth.$vif"; + VyattaKeepalived::vrrp_log("Delete found $eth.$vif"); + } + } + } + + my $num = scalar(@list); + VyattaKeepalived::vrrp_log("Start transation: $num changes"); + if ($num) { + vrrp_save_changes(@list); + } + return $num; +} + +sub remove_from_changes { + my $intf = shift; + + my @lines = vrrp_read_changes(); + if (scalar(@lines) < 1) { + # + # we shouldn't get to this point, but try to handle it if we do + # + system("rm -f $changes_file"); + return 0; + } + my @new_lines = (); + foreach my $line (@lines) { + if ($line =~ /$intf$/) { + VyattaKeepalived::vrrp_log("remove_from_changes [$line]"); + } else { + push @new_lines, $line; + } + } + + my $num_changes = scalar(@new_lines); + if ($num_changes > 0) { + vrrp_save_changes(@new_lines); + } else { + system("rm -f $changes_file"); + } + return $num_changes; +} + sub vrrp_update_config { - my $output; + my ($intf) = @_; + my $output = ''; my $config = new VyattaConfig; $config->setLevel("interfaces ethernet"); @@ -190,16 +338,14 @@ sub vrrp_update_config { } } } - + if ($vrrp_instances > 0) { my $sync_groups = vrrp_get_sync_groups(); if (defined $sync_groups && $sync_groups ne "") { $output = $sync_groups . $output; } - my $conf_file = VyattaKeepalived::get_conf_file(); keepalived_write_file($conf_file, $output); - VyattaKeepalived::restart_daemon($conf_file); - } + } return $vrrp_instances; } @@ -227,8 +373,22 @@ if (! defined $action) { } if ($action eq "update") { - my $vrrp_instances = vrrp_update_config(); - VyattaKeepalived::vrrp_log("vrrp update $vrrp_intf $vrrp_instances"); + VyattaKeepalived::vrrp_log("vrrp update $vrrp_intf"); + if ( ! -e $changes_file) { + my $num_changes = vrrp_find_changes(); + if ($num_changes == 0) { + # + # Shouldn't happen, but ... + # + VyattaKeepalived::vrrp_log("unexpected 0 changes"); + } + } + my $vrrp_instances = vrrp_update_config($vrrp_intf); + my $more_changes = remove_from_changes($vrrp_intf); + VyattaKeepalived::vrrp_log(" instances $vrrp_instances, $more_changes"); + if ($vrrp_instances > 0 and $more_changes == 0) { + VyattaKeepalived::restart_daemon($conf_file); + } if ($vrrp_instances == 0) { VyattaKeepalived::stop_daemon(); } @@ -239,9 +399,9 @@ if ($action eq "delete") { print "must include interface & group"; exit 1; } + VyattaKeepalived::vrrp_log("vrrp delete $vrrp_intf $vrrp_group"); my $state_file = VyattaKeepalived::get_state_file($vrrp_intf, $vrrp_group); system("rm -f $state_file"); - VyattaKeepalived::vrrp_log("vrrp delete $vrrp_intf $vrrp_group"); exit 0; } |