mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 18:08:42 -05:00
Allow authorized_keys to be overridden at VM checkout time
This commit is contained in:
parent
591c5a0391
commit
4c4f637075
3 changed files with 23 additions and 0 deletions
|
|
@ -2,10 +2,12 @@ require 'rubygems' unless defined?(Gem)
|
||||||
|
|
||||||
module Vmpooler
|
module Vmpooler
|
||||||
require 'json'
|
require 'json'
|
||||||
|
require 'net/scp'
|
||||||
require 'open-uri'
|
require 'open-uri'
|
||||||
require 'rbvmomi'
|
require 'rbvmomi'
|
||||||
require 'redis'
|
require 'redis'
|
||||||
require 'sinatra/base'
|
require 'sinatra/base'
|
||||||
|
require 'stringio'
|
||||||
require 'time'
|
require 'time'
|
||||||
require 'timeout'
|
require 'timeout'
|
||||||
require 'yaml'
|
require 'yaml'
|
||||||
|
|
|
||||||
|
|
@ -190,6 +190,10 @@ module Vmpooler
|
||||||
jdata = JSON.parse(request.body.read)
|
jdata = JSON.parse(request.body.read)
|
||||||
|
|
||||||
jdata.each do |template, count|
|
jdata.each do |template, count|
|
||||||
|
if (template == 'key')
|
||||||
|
result['key'] = count
|
||||||
|
end
|
||||||
|
|
||||||
if ( $redis.scard('vmpooler__ready__'+template) < count.to_i )
|
if ( $redis.scard('vmpooler__ready__'+template) < count.to_i )
|
||||||
available = 0
|
available = 0
|
||||||
end
|
end
|
||||||
|
|
@ -199,6 +203,10 @@ module Vmpooler
|
||||||
result['ok'] = true
|
result['ok'] = true
|
||||||
|
|
||||||
jdata.each do |template, count|
|
jdata.each do |template, count|
|
||||||
|
if (template == 'key')
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
result[template] ||= {}
|
result[template] ||= {}
|
||||||
|
|
||||||
result[template]['ok'] = true ##
|
result[template]['ok'] = true ##
|
||||||
|
|
@ -214,6 +222,13 @@ module Vmpooler
|
||||||
|
|
||||||
result[template]['ok'] = true ##
|
result[template]['ok'] = true ##
|
||||||
|
|
||||||
|
if ( result['key'] and $config[:config]['ssh_key'] )
|
||||||
|
Net::SCP.upload!(
|
||||||
|
vm, 'root', StringIO.new(result['key']), '/root/.ssh/authorized_keys',
|
||||||
|
:ssh => { :keys => [ $config[:config]['ssh_key'] ] }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
if ( result[template]['hostname'] )
|
if ( result[template]['hostname'] )
|
||||||
result[template]['hostname'] = [result[template]['hostname']] if ! result[template]['hostname'].is_a?(Array)
|
result[template]['hostname'] = [result[template]['hostname']] if ! result[template]['hostname'].is_a?(Array)
|
||||||
result[template]['hostname'].push(vm)
|
result[template]['hostname'].push(vm)
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,11 @@
|
||||||
#
|
#
|
||||||
# - domain
|
# - domain
|
||||||
# If set, returns a top-level 'domain' JSON key in POST requests
|
# If set, returns a top-level 'domain' JSON key in POST requests
|
||||||
|
#
|
||||||
|
# - ssh_key
|
||||||
|
# The path to a private key able to log into pooled VMs. If set, allows a
|
||||||
|
# 'key' parameter to be passed in POST requests to '/vm', overriding root's
|
||||||
|
# default authorized_keys file
|
||||||
|
|
||||||
# Example:
|
# Example:
|
||||||
|
|
||||||
|
|
@ -111,6 +116,7 @@
|
||||||
vm_checktime: 15
|
vm_checktime: 15
|
||||||
vm_lifetime: 12
|
vm_lifetime: 12
|
||||||
domain: 'company.com'
|
domain: 'company.com'
|
||||||
|
ssh_key: '/root/.ssh/id_rsa'
|
||||||
|
|
||||||
# :pools:
|
# :pools:
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue