Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-07-09 20:59:01 +03:00
Code Releases Activity

esxi: add 'port' config parameter

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2024-03-28 14:18:34 +01:00
parent a71c404392
commit 702049157b
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/PVE/Storage/ESXiPlugin.pm
View File

@ -4,9 +4,10 @@ use strict;
use warnings; use warnings;
use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC); use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
use JSON qw(from_json);
use POSIX ();
use File::Path qw(mkpath remove_tree); use File::Path qw(mkpath remove_tree);
use JSON qw(from_json);
use Net::IP;
use POSIX ();
use PVE::Network; use PVE::Network;
use PVE::Systemd; use PVE::Systemd;
@ -54,6 +55,7 @@ sub options {
username => {}, username => {},
password => { optional => 1}, password => { optional => 1},
'skip-cert-verification' => { optional => 1}, 'skip-cert-verification' => { optional => 1},
port => { optional => 1 },
}; };
} }
@ -136,6 +138,9 @@ sub get_manifest : prototype($$$;$) {
my @extra_params; my @extra_params;
push @extra_params, '--skip-cert-verification' if $scfg->{'skip-cert-verification'}; push @extra_params, '--skip-cert-verification' if $scfg->{'skip-cert-verification'};
if (my $port = $scfg->{port}) {
push @extra_params, '--port', $port;
}
my $host = $scfg->{server}; my $host = $scfg->{server};
my $user = $scfg->{username}; my $user = $scfg->{username};
my $pwfile = esxi_cred_file_name($storeid); my $pwfile = esxi_cred_file_name($storeid);
@ -191,6 +196,12 @@ sub esxi_mount : prototype($$$;$) {
my $host = $scfg->{server}; my $host = $scfg->{server};
my $pwfile = esxi_cred_file_name($storeid); my $pwfile = esxi_cred_file_name($storeid);
my $hostport = $host;
$hostport = "[$hostport]" if Net::IP::ip_is_ipv6($host);
if (my $port = $scfg->{port}) {
$hostport .= ":$port";
}
pipe(my $rd, my $wr) or die "failed to create pipe: $!\n"; pipe(my $rd, my $wr) or die "failed to create pipe: $!\n";
my $pid = fork(); my $pid = fork();
@ -221,7 +232,7 @@ sub esxi_mount : prototype($$$;$) {
'--ready-fd', fileno($wr), '--ready-fd', fileno($wr),
'--user', $user, '--user', $user,
'--password-file', $pwfile, '--password-file', $pwfile,
$host, $hostport,
$manifest_file, $manifest_file,
$mount_dir; $mount_dir;
die "exec failed: $!\n"; die "exec failed: $!\n";
@ -387,7 +398,8 @@ sub deactivate_volume {
sub check_connection { sub check_connection {
my ($class, $storeid, $scfg) = @_; my ($class, $storeid, $scfg) = @_;
return PVE::Network::tcp_ping($scfg->{server}, 443, 2); my $port = $scfg->{port} || 443;
return PVE::Network::tcp_ping($scfg->{server}, $port, 2);
} }
sub status { sub status {

1
src/PVE/Storage/PBSPlugin.pm
View File

@ -54,7 +54,6 @@ sub properties {
type => 'integer', type => 'integer',
minimum => 1, minimum => 1,
maximum => 65535, maximum => 65535,
default => 8007,
}, },
}; };
} }