[pve-devel] [PATCH RFC 12/21] pvecm create: use same file creation order a updatecerts

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


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

diff --git a/data/PVE/CLI/pvecm.pm b/data/PVE/CLI/pvecm.pm
index 2b4668d..2e60cda 100755
--- a/data/PVE/CLI/pvecm.pm
+++ b/data/PVE/CLI/pvecm.pm
@@ -163,10 +163,6 @@ __PACKAGE__->register_method ({
 
 	-f $clusterconf && die "cluster config '$clusterconf' already exists\n";
 
-	PVE::Cluster::setup_sshd_config(1);
-	PVE::Cluster::setup_rootsshconfig();
-	PVE::Cluster::setup_ssh_keys();
-
 	-f $authfile || __PACKAGE__->keygen({filename => $authfile});
 
 	-f $authfile || die "no authentication key available\n";
@@ -257,11 +253,15 @@ _EOD
 ;
 	PVE::Tools::file_set_contents($clusterconf, $config);
 
-	PVE::Cluster::ssh_merge_keys();
-
 	PVE::Cluster::gen_pve_node_files($nodename, $local_ip_address);
-
+	PVE::Cluster::setup_ssh_keys();
+	PVE::Cluster::ssh_merge_keys();
 	PVE::Cluster::ssh_merge_known_hosts($nodename, $local_ip_address, 1);
+	PVE::Cluster::gen_pve_vzdump_files();
+
+	PVE::Cluster::setup_sshd_config(1);
+	PVE::Cluster::setup_rootsshconfig();
+	PVE::Cluster::gen_pve_vzdump_symlink();
 
 	PVE::Tools::run_command('systemctl restart pve-cluster'); # restart
 
-- 
2.1.4




More information about the pve-devel mailing list