parameter default handling in __cdist type corrected
This commit is contained in:
		
					parent
					
						
							
								520bcc29a7
							
						
					
				
			
			
				commit
				
					
						92e67182a6
					
				
			
		
					 4 changed files with 6 additions and 15 deletions
				
			
		| 
						 | 
					@ -27,23 +27,11 @@ else
 | 
				
			||||||
   shell=""
 | 
					   shell=""
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -f "$__object/parameter/username" ]; then
 | 
					username="$(cat "$__object/parameter/username")"
 | 
				
			||||||
   username="$(cat "$__object/parameter/username")"
 | 
					 | 
				
			||||||
else
 | 
					 | 
				
			||||||
   username="cdist"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -f "$__object/parameter/branch" ]; then
 | 
					branch="$(cat "$__object/parameter/branch")"
 | 
				
			||||||
   branch="$(cat "$__object/parameter/branch")"
 | 
					 | 
				
			||||||
else
 | 
					 | 
				
			||||||
   branch="master"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -f "$__object/parameter/source" ]; then
 | 
					source="$(cat "$__object/parameter/source")"
 | 
				
			||||||
   source="$(cat "$__object/parameter/source")"
 | 
					 | 
				
			||||||
else
 | 
					 | 
				
			||||||
   source="git://github.com/telmich/cdist.git"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Currently hardcoded - if anyone cares, make a parameter
 | 
					# Currently hardcoded - if anyone cares, make a parameter
 | 
				
			||||||
# out of it
 | 
					# out of it
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										1
									
								
								cdist/conf/type/__cdist/parameter/default/branch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cdist/conf/type/__cdist/parameter/default/branch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					master
 | 
				
			||||||
							
								
								
									
										1
									
								
								cdist/conf/type/__cdist/parameter/default/source
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cdist/conf/type/__cdist/parameter/default/source
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					git://github.com/telmich/cdist.git
 | 
				
			||||||
							
								
								
									
										1
									
								
								cdist/conf/type/__cdist/parameter/default/username
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cdist/conf/type/__cdist/parameter/default/username
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1 @@
 | 
				
			||||||
 | 
					cdist
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue