shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

M #-: Fix VULTR_LOCATION path when using ONE_LOCATION (#1342)

Browse Source 
Applies to one-6.0 and master.

(cherry picked from commit 1e0ae1382bb6b927b117d14bc42be1910db15eee)
This commit is contained in:
Vlastimil Holer 2021-06-30 11:45:24 +02:00 committed by Ruben S. Montero
parent 29584dc03d
commit dd671bca86
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ipamm_mad/remotes/vultr/register_address_range
View File

@ -73,7 +73,7 @@ if !ONE_LOCATION
GEMS_LOCATION ||= '/usr/share/one/gems'
else
LIB_LOCATION ||= ONE_LOCATION + '/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
VULTR_LOCATION ||= ONE_LOCATION + '/lib/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION ||= ONE_LOCATION + '/share/gems'
end

2
src/ipamm_mad/remotes/vultr/unregister_address_range
View File

@ -33,7 +33,7 @@ if !ONE_LOCATION
GEMS_LOCATION ||= '/usr/share/one/gems'
else
LIB_LOCATION ||= ONE_LOCATION + '/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
VULTR_LOCATION ||= ONE_LOCATION + '/lib/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION ||= ONE_LOCATION + '/share/gems'
end

2
src/oneprovision/lib/terraform/providers/vultr.rb
View File

@ -19,7 +19,7 @@ ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION)
if !ONE_LOCATION
VULTR_LOCATION ||= '/usr/lib/one/oneprovision/provider_apis/vultr'
else
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
VULTR_LOCATION ||= ONE_LOCATION + '/lib/oneprovision/provider_apis/vultr'
end
$LOAD_PATH << VULTR_LOCATION

2
src/vnm_mad/remotes/elastic/vultr_vnm.rb
View File

@ -23,7 +23,7 @@ if !ONE_LOCATION
GEMS_LOCATION ||= '/usr/share/one/gems'
else
LIB_LOCATION ||= ONE_LOCATION + '/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
VULTR_LOCATION ||= ONE_LOCATION + '/lib/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION ||= ONE_LOCATION + '/share/gems'
end