forked from ungleich-public/cdist
		
	definitely cleanup remote directory first, so we see more bugs :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								b470a47b15
							
						
					
				
			
			
				commit
				
					
						4e95535b7c
					
				
			
		
					 1 changed files with 4 additions and 6 deletions
				
			
		
							
								
								
									
										10
									
								
								bin/cdist
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								bin/cdist
									
										
									
									
									
								
							| 
						 | 
					@ -327,6 +327,7 @@ class Cdist:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   def transfer_global_explorers(self):
 | 
					   def transfer_global_explorers(self):
 | 
				
			||||||
      """Transfer the global explorers"""
 | 
					      """Transfer the global explorers"""
 | 
				
			||||||
 | 
					      self.remote_mkdir(REMOTE_GLOBAL_EXPLORER_DIR)
 | 
				
			||||||
      self.transfer_dir(self.global_explorer_dir, REMOTE_GLOBAL_EXPLORER_DIR)
 | 
					      self.transfer_dir(self.global_explorer_dir, REMOTE_GLOBAL_EXPLORER_DIR)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   def transfer_type_explorers(self, type):
 | 
					   def transfer_type_explorers(self, type):
 | 
				
			||||||
| 
						 | 
					@ -406,12 +407,9 @@ class Cdist:
 | 
				
			||||||
   def init_deploy(self):
 | 
					   def init_deploy(self):
 | 
				
			||||||
      log.debug("Creating clean directory structure")
 | 
					      log.debug("Creating clean directory structure")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      # Ensure there is no old stuff, neither local nor remote
 | 
					      self.remove_remote_dir(REMOTE_BASE_DIR)
 | 
				
			||||||
   #   remote_run_or_fail(hostname, ["rm -rf", "${__cdist_remote_base_dir}"])
 | 
					      self.remote_mkdir(REMOTE_BASE_DIR)
 | 
				
			||||||
   #
 | 
					
 | 
				
			||||||
   #   # Create base directories
 | 
					 | 
				
			||||||
   #   remote_run_or_fail(hostname,["mkdir -p", "${__cdist_remote_base_dir}"])
 | 
					 | 
				
			||||||
   #
 | 
					 | 
				
			||||||
   #   # Link configuraion source directory - consistent with remote
 | 
					   #   # Link configuraion source directory - consistent with remote
 | 
				
			||||||
   #   run_or_fail(["ln -sf", "$__cdist_conf_dir", "$__cdist_local_base_dir/$__cdist_name_conf_dir"])
 | 
					   #   run_or_fail(["ln -sf", "$__cdist_conf_dir", "$__cdist_local_base_dir/$__cdist_name_conf_dir"])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue