lib/dev-lxc/server.rb in dev-lxc-1.4.0 vs lib/dev-lxc/server.rb in dev-lxc-1.5.0
- old
+ new
@@ -53,11 +53,10 @@
@server_ctl = 'chef-server'
end
@shared_image_name += "-#{@chef_server_version}"
@shared_image_name += "-reporting-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["reporting"].to_s.match(/[_-]((\d+\.?){3,})/)
@shared_image_name += "-pushy-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["push-jobs-server"].to_s.match(/[_-]((\d+\.?){3,})/)
- @shared_image_name += "-sync-#{Regexp.last_match[1].gsub(".", "-")}" if @packages["sync"].to_s.match(/[_-]((\d+\.?){3,})/)
end
end
def realpath(rootfs_path)
"#{@server.config_item('lxc.rootfs')}#{rootfs_path}" if @server.defined?
@@ -259,10 +258,9 @@
shared_image.install_package(@packages["analytics"]) unless @packages["analytics"].nil?
when 'chef-server'
shared_image.install_package(@packages["server"]) unless @packages["server"].nil?
shared_image.install_package(@packages["reporting"]) unless @packages["reporting"].nil?
shared_image.install_package(@packages["push-jobs-server"]) unless @packages["push-jobs-server"].nil?
- shared_image.install_package(@packages["sync"]) unless @packages["sync"].nil?
end
shared_image.stop
return shared_image
end