NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #766 from reidrac/include-and-vagranfile-package-support

Browse Source 
Support for --include and --vagrantfile in package action
This commit is contained in:
Dmitry Vasilets 2017-04-25 15:19:38 +02:00 committed by GitHub
commit c584733b94
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/vagrant-libvirt/action/package_domain.rb
View File

@ -39,12 +39,29 @@ module VagrantPlugins
# remove hw association with interface # remove hw association with interface
# working for centos with lvs default disks # working for centos with lvs default disks
`virt-sysprep --no-logfile --operations defaults,-ssh-userdir -a #{@tmp_img}` `virt-sysprep --no-logfile --operations defaults,-ssh-userdir -a #{@tmp_img}`
# add any user provided file
extra = ''
@tmp_include = @tmp_dir + '/_include'
if env['package.include']
extra = './_include'
Dir.mkdir(@tmp_include)
env['package.include'].each do |f|
env[:ui].info("Including user file: #{f}")
FileUtils.cp(f, @tmp_include)
end
end
if env['package.vagrantfile']
extra = './_include'
Dir.mkdir(@tmp_include) unless File.directory?(@tmp_include)
env[:ui].info('Including user Vagrantfile')
FileUtils.cp(env['package.vagrantfile'], @tmp_include + '/Vagrantfile')
end
Dir.chdir(@tmp_dir) Dir.chdir(@tmp_dir)
info = JSON.parse(`qemu-img info --output=json #{@tmp_img}`) info = JSON.parse(`qemu-img info --output=json #{@tmp_img}`)
img_size = (Float(info['virtual-size'])/(1024**3)).ceil img_size = (Float(info['virtual-size'])/(1024**3)).ceil
File.write(@tmp_dir + '/metadata.json', metadata_content(img_size)) File.write(@tmp_dir + '/metadata.json', metadata_content(img_size))
File.write(@tmp_dir + '/Vagrantfile', vagrantfile_content) File.write(@tmp_dir + '/Vagrantfile', vagrantfile_content)
assebmle_box(boxname) assemble_box(boxname, extra)
FileUtils.mv(@tmp_dir + '/' + boxname, '../' + boxname) FileUtils.mv(@tmp_dir + '/' + boxname, '../' + boxname)
FileUtils.rm_rf(@tmp_dir) FileUtils.rm_rf(@tmp_dir)
env[:ui].info('Box created') env[:ui].info('Box created')
@ -53,8 +70,8 @@ module VagrantPlugins
@app.call(env) @app.call(env)
end end
def assebmle_box(boxname) def assemble_box(boxname, extra)
`tar cvzf "#{boxname}" --totals ./metadata.json ./Vagrantfile ./box.img` `tar cvzf "#{boxname}" --totals ./metadata.json ./Vagrantfile ./box.img #{extra}`
end end
def vagrantfile_content def vagrantfile_content
@ -67,6 +84,9 @@ module VagrantPlugins
libvirt.storage_pool_name = "default" libvirt.storage_pool_name = "default"
end end
end end
user_vagrantfile = File.expand_path('../_include/Vagrantfile', __FILE__)
load user_vagrantfile if File.exists?(user_vagrantfile)
EOF EOF
end end