moved authz_keys binds to deploy stage

srl-labs · Dec 9, 2021 · bbf0ec0 · bbf0ec0
1 parent a785adf
commit bbf0ec0
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/nodes/srl/srl.go b/nodes/srl/srl.go
@@ -154,16 +154,6 @@ func (s *srl) Init(cfg *types.NodeConfig, opts ...nodes.NodeOption) error {
 	topoPath := filepath.Join(s.cfg.LabDir, "topology.yml")
 	s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(topoPath, ":/tmp/topology.yml:ro"))
 
-	// mount authorized_keys file to enable passwordless login
-	authzKeysPath := filepath.Join(filepath.Dir(s.cfg.LabDir), "authorized_keys")
-	log.Warn("authzKeysPath:", authzKeysPath)
-	if utils.FileExists(authzKeysPath) {
-		log.Warn("authzKeyFile exists, mounting")
-		s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(authzKeysPath, ":/root/.ssh/authorized_keys:ro"))
-		s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(authzKeysPath, ":/home/linuxadmin/.ssh/authorized_keys:ro"))
-		s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(authzKeysPath, ":/home/admin/.ssh/authorized_keys:ro"))
-	}
-
 	return nil
 }
 
@@ -218,6 +208,16 @@ func (s *srl) PreDeploy(configName, labCADir, labCARoot string) error {
 		}
 	}
 
+	// mount authorized_keys file to enable passwordless login
+	authzKeysPath := filepath.Join(filepath.Dir(s.cfg.LabDir), "authorized_keys")
+	log.Warn("authzKeysPath:", authzKeysPath)
+	if utils.FileExists(authzKeysPath) {
+		log.Warn("authzKeyFile exists, mounting")
+		s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(authzKeysPath, ":/root/.ssh/authorized_keys:ro"))
+		s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(authzKeysPath, ":/home/linuxadmin/.ssh/authorized_keys:ro"))
+		s.cfg.Binds = append(s.cfg.Binds, fmt.Sprint(authzKeysPath, ":/home/admin/.ssh/authorized_keys:ro"))
+	}
+
 	return s.createSRLFiles()
 }