TT#50651 Rework host key setting

Create a new function to set a key conditionally on its value being
defined. And rename the set_yml_config and its arguments to make it
clearer what it is doing.

Change-Id: Idefd89314b5ff76ed0f386135b3791a3309db34c
changes/13/26913/1
Guillem Jover 7 years ago
parent b61b3630fe
commit ecf613ea35

@ -379,15 +379,24 @@ sub remove_interface {
return;
}
sub set_yml_config {
my $setting = shift or croak 'Usage: set_yml_config <setting> <value>';
my $value = shift or croak 'Usage: set_yml_config <setting> <value>';
sub set_host_key {
my $key = shift or croak 'Usage: set_host_key <key> <value>';
my $value = shift or croak 'Usage: set_host_key <key> <value>';
$yaml->{hosts}->{$host}->{$setting} = "$value";
logger("\$yaml->{hosts}->{\$host}->{$setting} = $value");
$yaml->{hosts}->{$host}->{$key} = "$value";
logger("\$yaml->{hosts}->{\$host}->{$key} = $value");
return;
}
sub set_host_key_cond {
my ($key, $value) = @_;
if ( defined $value ) {
logger("set_host_key('$key', $value)");
set_host_key($key, $value);
}
}
sub set_iface_config {
my $iface = shift
or croak 'Usage: set_iface_config <iface> <setting> <value>';
@ -445,7 +454,7 @@ sub set_dbnode {
$new_dbnode = $max + 1;
logger("use $new_dbnode");
}
set_yml_config('dbnode', $new_dbnode);
set_host_key('dbnode', $new_dbnode);
return;
}
@ -595,15 +604,8 @@ if ( !defined $move_from || !defined $move_to ) {
}
}
if ( defined $peer ) {
logger("set_yml_config('peer', $peer)");
set_yml_config( 'peer', $peer );
}
if ( defined $internal_iface ) {
logger("set_yml_config('internal_iface', $internal_iface)");
set_yml_config( 'internal_iface', $internal_iface );
}
set_host_key_cond('peer', $peer);
set_host_key_cond('internal_iface', $internal_iface);
if ( defined $dbnode ) {
logger("set_dbnode($dbnode)");

Loading…
Cancel
Save