TT#161150 NGCP::Template::Object: Switch get_nodename() to use ngcp-nodename

Let's remove the duplicate implementation, and simply off-load to the
command, so that we only need to modify one place.

As a side effect, this removes a bogus fallback value of 'self' for
CE systems, which should have been 'spce'.

Change-Id: I70b48caad3da4123a3399254deda73c381ae67d9
mr10.5.1
Guillem Jover 4 years ago
parent c692abd444
commit cecd2b007e

@ -113,20 +113,10 @@ sub get_nodename
# Otherwise, get the nodename for this host.
return $self->{nodename} if exists $self->{nodename};
my $filename = '/etc/ngcp_ha_node';
$filename = '/etc/ngcp_nodename' unless -f $filename;
open my $hh, '<', $filename or die "Error opening $filename";
my $nodename = <$hh>;
close $hh;
my $nodename = qx(ngcp-nodename);
chomp $nodename;
die "Fatal error retrieving nodename [$nodename]" unless length $nodename;
if (exists $self->{config}{hosts}{self} and
not exists $self->{config}{hosts}{$nodename}) {
$nodename = 'self';
}
$self->{nodename} = $nodename;
return $nodename;

Loading…
Cancel
Save