diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 16:58:48 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 16:58:48 -0800 |
| commit | c4024d37061372e2bd2b8df5d5c21fb875fd6e7f (patch) | |
| tree | 493a6ebc2a213bc4d53d7fdf9e94eb0fb6ce2c0c | |
| parent | 7237a1b0855751870198838cd5f8b9fa8d38e142 (diff) | |
| download | vyatta-cluster-c4024d37061372e2bd2b8df5d5c21fb875fd6e7f.tar.gz vyatta-cluster-c4024d37061372e2bd2b8df5d5c21fb875fd6e7f.zip | |
Rename VyattaClusterConfig to Vyatta::Cluster::Config
Reorganization
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | lib/Vyatta/Cluster/Config.pm (renamed from scripts/VyattaClusterConfig.pm) | 11 | ||||
| -rwxr-xr-x | scripts/vyatta-show-cluster.pl | 4 | ||||
| -rwxr-xr-x | scripts/vyatta-update-cluster.pl | 4 |
4 files changed, 11 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index f74c4e2..bec9339 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ cfgdir = $(datadir)/vyatta-cfg/templates opdir = $(datadir)/vyatta-op/templates -share_perl5dir = $(datadir)/perl5 +share_perl5dir = $(datadir)/perl5/Vyatta/Cluster curverdir = $(sysconfdir)/config-migrate/current etc_ha_resourcedir = /etc/ha.d/resource.d @@ -9,7 +9,7 @@ lib_ocf_resourcedir = /usr/lib/ocf/resource.d/heartbeat sbin_SCRIPTS = scripts/vyatta-update-cluster.pl sbin_SCRIPTS += scripts/vyatta-show-cluster.pl -share_perl5_DATA = scripts/VyattaClusterConfig.pm +share_perl5_DATA = lib/Vyatta/Cluster/Config.pm curver_DATA = cfg-version/cluster@1 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ diff --git a/scripts/VyattaClusterConfig.pm b/lib/Vyatta/Cluster/Config.pm index 3b564eb..5756567 100644 --- a/scripts/VyattaClusterConfig.pm +++ b/lib/Vyatta/Cluster/Config.pm @@ -1,8 +1,8 @@ -package VyattaClusterConfig; +package Vyatta::Cluster::Config; use strict; -use lib "/opt/vyatta/share/perl5/"; -use VyattaConfig; +use lib "/opt/vyatta/share/perl5"; +use Vyatta::Config; my $DEFAULT_INITDEAD = 30000; my $DEFAULT_DEADPING = 30000; @@ -42,7 +42,7 @@ sub new { sub setup { my ( $self, $level ) = @_; - my $config = new VyattaConfig; + my $config = new Vyatta::Config; $config->setLevel("$level"); my @nodes = $config->listNodes(); @@ -82,7 +82,7 @@ sub setup { sub setupOrig { my ( $self, $level ) = @_; - my $config = new VyattaConfig; + my $config = new Vyatta::Config; $config->setLevel("$level"); my @nodes = $config->listOrigNodes(); @@ -377,4 +377,3 @@ sub print_str { } 1; - diff --git a/scripts/vyatta-show-cluster.pl b/scripts/vyatta-show-cluster.pl index 2ad29ce..cd54968 100755 --- a/scripts/vyatta-show-cluster.pl +++ b/scripts/vyatta-show-cluster.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl use strict; -use lib "/opt/vyatta/share/perl5/"; -use VyattaClusterConfig; +use lib "/opt/vyatta/share/perl5"; +use Vyatta::Cluster::Config; my $CL_STATUS = "/usr/bin/cl_status"; diff --git a/scripts/vyatta-update-cluster.pl b/scripts/vyatta-update-cluster.pl index dbe4b74..c2a438c 100755 --- a/scripts/vyatta-update-cluster.pl +++ b/scripts/vyatta-update-cluster.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl use strict; -use lib "/opt/vyatta/share/perl5/"; -use VyattaClusterConfig; +use lib "/opt/vyatta/share/perl5"; +use Vyatta::Cluster::Config; my $HA_DIR = "/etc/ha.d"; my $HA_INIT = "/etc/init.d/heartbeat"; |