Remove code dead for more than 2 years
r10k generates a .r10k-deploy.json file since version 2.1.0 which was released on October 28, 2015. New users of the control-repo are not likely to have a so old version of r10k, so remove this dead code.
This commit is contained in:
		
							parent
							
								
									211ecc58b5
								
							
						
					
					
						commit
						415a71dd59
					
				@ -1,24 +0,0 @@
 | 
				
			|||||||
begin
 | 
					 | 
				
			||||||
  require 'rugged'
 | 
					 | 
				
			||||||
  require 'socket'
 | 
					 | 
				
			||||||
rescue LoadError
 | 
					 | 
				
			||||||
  t = Time.new
 | 
					 | 
				
			||||||
  puts t.to_i
 | 
					 | 
				
			||||||
else
 | 
					 | 
				
			||||||
  environmentpath = ARGV[0]
 | 
					 | 
				
			||||||
  environment     = ARGV[1]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Get the hostname of the Puppet master compiling the catalog.
 | 
					 | 
				
			||||||
  # Sometimes the hostname is the fqdn, so we'll take the first segment.
 | 
					 | 
				
			||||||
  compiling_master = Socket.gethostname.split('.').first
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Get the path to the environment being compiled.
 | 
					 | 
				
			||||||
  repo = Rugged::Repository.discover(File.join(environmentpath, environment))
 | 
					 | 
				
			||||||
  head = repo.head
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # First 12 characters of the sha1 hash of the newest commit.
 | 
					 | 
				
			||||||
  commit_id = head.target_id[0...11]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Show the compiling master, environment name, and commit ID.
 | 
					 | 
				
			||||||
  puts "#{compiling_master}-#{environment}-#{commit_id}"
 | 
					 | 
				
			||||||
end
 | 
					 | 
				
			||||||
@ -6,14 +6,9 @@ if [ $# -ne 2 -o ! -d "$1" -o ! -d "$1/$2" ]; then
 | 
				
			|||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ruby=ruby
 | 
					ruby=ruby
 | 
				
			||||||
script="$1/$2/scripts/config_version.rb"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -x /opt/puppetlabs/puppet/bin/ruby ]; then
 | 
					if [ -x /opt/puppetlabs/puppet/bin/ruby ]; then
 | 
				
			||||||
  ruby=/opt/puppetlabs/puppet/bin/ruby
 | 
					  ruby=/opt/puppetlabs/puppet/bin/ruby
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -e $1/$2/.r10k-deploy.json ]; then
 | 
					"${ruby}" "$1/$2/scripts/code_manager_config_version.rb" "$1" "$2"
 | 
				
			||||||
  script="$1/$2/scripts/code_manager_config_version.rb"
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
"${ruby}" "${script}" "$1" "$2"
 | 
					 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user