begin move of cdist-type-emulator to lib/ and submit initial_manifest to cdist
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
		
					parent
					
						
							
								97f7513f6e
							
						
					
				
			
			
				commit
				
					
						d6db6d0c7e
					
				
			
		
					 2 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
					@ -32,6 +32,7 @@ import tempfile
 | 
				
			||||||
BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
 | 
					BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
 | 
				
			||||||
CONF_DIR                   = os.path.join(BASE_DIR, "conf")
 | 
					CONF_DIR                   = os.path.join(BASE_DIR, "conf")
 | 
				
			||||||
GLOBAL_EXPLORER_DIR        = os.path.join(CONF_DIR, "explorer")
 | 
					GLOBAL_EXPLORER_DIR        = os.path.join(CONF_DIR, "explorer")
 | 
				
			||||||
 | 
					LIB_DIR                    = os.path.join(BASE_DIR, "lib")
 | 
				
			||||||
MANIFEST_DIR               = os.path.join(CONF_DIR, "manifest")
 | 
					MANIFEST_DIR               = os.path.join(CONF_DIR, "manifest")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
REMOTE_BASE_DIR            = "/var/lib/cdist"
 | 
					REMOTE_BASE_DIR            = "/var/lib/cdist"
 | 
				
			||||||
| 
						 | 
					@ -220,7 +221,7 @@ if __name__ == "__main__":
 | 
				
			||||||
      log.debug(args)
 | 
					      log.debug(args)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      for host in args.host:
 | 
					      for host in args.host:
 | 
				
			||||||
         c = Cdist(host)
 | 
					         c = Cdist(host, initial_manifest=args.manifest)
 | 
				
			||||||
         c.deploy_to()
 | 
					         c.deploy_to()
 | 
				
			||||||
         c.cleanup()
 | 
					         c.cleanup()
 | 
				
			||||||
   except KeyboardInterrupt:
 | 
					   except KeyboardInterrupt:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue