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

F #5387: change Vultr API dir (#1236)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2021-05-19 16:46:47 +02:00 committed by GitHub
parent 2b7cb80f75
commit 7078b8d298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@ -292,6 +292,8 @@ LIB_DIRS="$LIB_LOCATION/ruby \
$LIB_LOCATION/ruby/vcenter_driver \
$LIB_LOCATION/ruby/nsx_driver \
$LIB_LOCATION/oneprovision/lib \
$LIB_LOCATION/oneprovision/provider_apis \
$LIB_LOCATION/oneprovision/provider_apis/vultr \
$LIB_LOCATION/oneprovision/lib/terraform \
$LIB_LOCATION/oneprovision/lib/terraform/providers \
$LIB_LOCATION/oneprovision/lib/terraform/providers/templates \
@ -784,6 +786,8 @@ INSTALL_ONEPROVISION_FILES=(
ONEPROVISION_ANSIBLE_FILES:$SHARE_LOCATION/oneprovision
ONEPROVISION_TEMPLATES_FILES:$SHARE_LOCATION/oneprovision
ONEPROVISION_LIB_FILES:$LIB_LOCATION/oneprovision/lib
ONEPROVISION_LIB_API_FILES:$LIB_LOCATION/oneprovision/provider_apis
ONEPROVISION_LIB_API_VULTR_FILES:$LIB_LOCATION/oneprovision/provider_apis/vultr
ONEPROVISION_LIB_TF_FILES:$LIB_LOCATION/oneprovision/lib/terraform
ONEPROVISION_LIB_PROVIDERS_FILES:$LIB_LOCATION/oneprovision/lib/terraform/providers
ONEPROVISION_LIB_AWS_ERB_FILES:$LIB_LOCATION/oneprovision/lib/terraform/providers/templates/aws
@ -2491,6 +2495,8 @@ ONEPROVISION_TEMPLATES_FILES="share/oneprovision/edge-clusters/"
ONEPROVISION_LIB_FILES="src/oneprovision/lib/oneprovision.rb \
src/oneprovision/lib/provision_element.rb"
ONEPROVISION_LIB_API_VULTR_FILES="src/oneprovision/provider_apis/vultr/lib/vultr.rb"
ONEPROVISION_LIB_PROVISION_FILES="src/oneprovision/lib/provision/ansible.rb \
src/oneprovision/lib/provision/oneprovision.rb \
src/oneprovision/lib/provision/driver.rb \
@ -2956,8 +2962,7 @@ DOCS_FILES="LICENSE LICENSE.onsla LICENSE.onsla-nc NOTICE README.md"
# Ruby VENDOR files
#-----------------------------------------------------------------------------
VENDOR_DIRS="share/vendor/ruby/gems/packethost \
share/vendor/ruby/gems/vultr"
VENDOR_DIRS="share/vendor/ruby/gems/packethost"
#-------------------------------------------------------------------------------
# Libvirt RelaxNG schemas

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

@ -68,12 +68,12 @@ ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION)
if !ONE_LOCATION
LIB_LOCATION ||= '/usr/lib/one'
VULTR_LOCATION ||= '/usr/lib/one/ruby/vendors/vultr/lib'
VULTR_LOCATION ||= '/usr/lib/one/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= '/usr/lib/one/ruby'
GEMS_LOCATION ||= '/usr/share/one/gems'
else
LIB_LOCATION ||= ONE_LOCATION + '/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/lib/ruby/vendors/vultr/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION ||= ONE_LOCATION + '/share/gems'
end

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

@ -28,12 +28,12 @@ ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION)
if !ONE_LOCATION
LIB_LOCATION ||= '/usr/lib/one'
VULTR_LOCATION ||= '/usr/lib/one/ruby/vendors/vultr/lib'
VULTR_LOCATION ||= '/usr/lib/one/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= '/usr/lib/one/ruby'
GEMS_LOCATION ||= '/usr/share/one/gems'
else
LIB_LOCATION ||= ONE_LOCATION + '/lib'
VULTR_LOCATION ||= '/usr/lib/one/ruby/vendors/vultr/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION ||= ONE_LOCATION + '/share/gems'
end

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

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

0
share/vendor/ruby/gems/vultr/lib/vultr.rb → src/oneprovision/provider_apis/vultr/lib/vultr.rb
View File

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

@ -18,14 +18,14 @@ ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION)
if !ONE_LOCATION
LIB_LOCATION ||= '/usr/lib/one'
VULTR_LOCATION ||= '/usr/lib/one/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= '/usr/lib/one/ruby'
GEMS_LOCATION ||= '/usr/share/one/gems'
VULTR_LOCATION ||= '/usr/lib/one/ruby/vendors/vultr/lib'
else
LIB_LOCATION ||= ONE_LOCATION + '/lib'
VULTR_LOCATION ||= ONE_LOCATION + '/oneprovision/provider_apis/vultr'
RUBY_LIB_LOCATION ||= ONE_LOCATION + '/lib/ruby'
GEMS_LOCATION ||= ONE_LOCATION + '/share/gems'
VULTR_LOCATION ||= ONE_LOCATION + '/lib/ruby/vendors/vultr/lib'
end
# %%RUBYGEMS_SETUP_BEGIN%%