shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-03 13:47:01 +03:00
Code Releases Wiki Activity

F #962: Sunstone preload gems, bump oneprovision repo (#4640)

Browse Source 
* Ensure base bundled gems are loaded first
* Default Ansible opennebula-repository 5.11
This commit is contained in:
Vlastimil Holer 2020-04-30 19:34:29 +02:00 committed by GitHub
parent c62fe20ecf
commit 13040cb87a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/oneprovision/ansible/roles/opennebula-repository/defaults/main.yml
View File

@ -5,7 +5,7 @@
###############################################################################
# OpenNebula repository version
opennebula_repository_version: '5.10'
opennebula_repository_version: '5.11'
# Repository of the OpenNebula packages
opennebula_repository_base: 'https://downloads.opennebula.io/repo/{{ opennebula_repository_version }}'

12
src/sunstone/sunstone-server.rb
View File

@ -48,6 +48,18 @@ SUNSTONE_ROOT_DIR = File.dirname(__FILE__)
if File.directory?(GEMS_LOCATION)
Gem.use_paths(GEMS_LOCATION)
$LOAD_PATH.reject! {|l| l =~ /(vendor|site)_ruby/ }
# for some platforms, we redistribute newer base Ruby gems which
# should be loaded instead of default ones in the distributions
require 'rubygems'
%w[openssl json].each do |name|
begin
gem name
rescue LoadError
# ignore
end
end
end
$LOAD_PATH << RUBY_LIB_LOCATION