[pve-devel] [PATCH RFC 14/21] pcecm add: reuse code from update_cluster_files

Dietmar Maurer dietmar at proxmox.com
Mon Nov 28 08:09:06 CET 2016


Signed-off-by: Dietmar Maurer <dietmar at proxmox.com>
---
 data/PVE/CLI/pvecm.pm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/data/PVE/CLI/pvecm.pm b/data/PVE/CLI/pvecm.pm
index ad9a9b0..9f6c479 100755
--- a/data/PVE/CLI/pvecm.pm
+++ b/data/PVE/CLI/pvecm.pm
@@ -496,10 +496,6 @@ __PACKAGE__->register_method ({
 
 	my $nodename = PVE::INotify::nodename();
 
-	PVE::Cluster::setup_sshd_config(1);
-	PVE::Cluster::setup_rootsshconfig();
-	PVE::Cluster::setup_ssh_keys();
-
 	my $host = $param->{hostname};
 
 	if (!$param->{force}) {
@@ -596,11 +592,7 @@ __PACKAGE__->register_method ({
 
 	    my $local_ip_address = PVE::Cluster::remote_node_ip($nodename);
 
-	    print "generating node certificates\n";
-	    PVE::Cluster::gen_pve_node_files($nodename, $local_ip_address); 
-
-	    print "merge known_hosts file\n";
-	    PVE::Cluster::ssh_merge_known_hosts($nodename, $local_ip_address, 1);
+	    $update_cluster_files->(1, $nodename, $local_ip_address, 1);
 
 	    print "restart services\n";
 	    # restart pvedaemon (changed certs)
-- 
2.1.4




More information about the pve-devel mailing list