refactor: rename striker-open-ssh-tunnel->anvil-manage-tunnel

main
Tsu-ba-me 1 year ago committed by Yanhao Lei
parent 076c3bd80b
commit 3e5fde0e2d
  1. 2
      Anvil/Tools.pm
  2. 2
      tools/Makefile.am
  3. 0
      tools/anvil-manage-tunnel
  4. 4
      tools/striker-manage-vnc-pipes

@ -1153,6 +1153,7 @@ sub _set_paths
'anvil-manage-firewall' => "/usr/sbin/anvil-manage-firewall",
'anvil-manage-keys' => "/usr/sbin/anvil-manage-keys",
'anvil-manage-power' => "/usr/sbin/anvil-manage-power",
'anvil-manage-tunnel' => "/usr/sbin/anvil-manage-tunnel",
'anvil-migrate-server' => "/usr/sbin/anvil-migrate-server",
'anvil-parse-fence-agents' => "/usr/sbin/anvil-parse-fence-agents",
'anvil-provision-server' => "/usr/sbin/anvil-provision-server",
@ -1284,7 +1285,6 @@ sub _set_paths
'striker-manage-install-target' => "/usr/sbin/striker-manage-install-target",
'striker-manage-peers' => "/usr/sbin/striker-manage-peers",
'striker-manage-vnc-pipes' => "/usr/sbin/striker-manage-vnc-pipes",
'striker-open-ssh-tunnel' => "/usr/sbin/striker-open-ssh-tunnel",
'striker-parse-oui' => "/usr/sbin/striker-parse-oui",
'striker-prep-database' => "/usr/sbin/striker-prep-database",
'striker-scan-network' => "/usr/sbin/striker-scan-network",

@ -26,6 +26,7 @@ dist_sbin_SCRIPTS = \
anvil-manage-server \
anvil-manage-server-storage \
anvil-manage-storage-groups \
anvil-manage-tunnel \
anvil-migrate-server \
anvil-network-profiler \
anvil-parse-fence-agents \
@ -61,7 +62,6 @@ dist_sbin_SCRIPTS = \
striker-manage-install-target \
striker-manage-peers \
striker-manage-vnc-pipes \
striker-open-ssh-tunnel \
striker-parse-os-list \
striker-parse-oui \
striker-prep-database \

@ -199,7 +199,7 @@ sub is_ssh_process
my ($shell_return_code, $shell_output) = call({ host_name => $host_name, call => $shell_call });
return $shell_output =~ /striker-open-ssh-tunnel/ ? 1 : 0;
return $shell_output =~ /anvil-manage-tunnel/ ? 1 : 0;
}
sub is_websockify_exists
@ -542,7 +542,7 @@ sub start_ssh_tunnel
return;
}
my $shell_call = $anvil->data->{path}{exe}{'striker-open-ssh-tunnel'}
my $shell_call = $anvil->data->{path}{exe}{'anvil-manage-tunnel'}
." --remote-user admin --target ".$ws_host_name
." --forward-local-port ".$ssh_tunnel_dest_port
." --forward-remote-port ".$ws_dest_port

Loading…
Cancel
Save