From dd671bca86fc36e8250b4ffa37a9fb166b55aa81 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Wed, 30 Jun 2021 11:45:24 +0200 Subject: [PATCH] M #-: Fix VULTR_LOCATION path when using ONE_LOCATION (#1342) Applies to one-6.0 and master. (cherry picked from commit 1e0ae1382bb6b927b117d14bc42be1910db15eee) --- src/ipamm_mad/remotes/vultr/register_address_range | 2 +- src/ipamm_mad/remotes/vultr/unregister_address_range | 2 +- src/oneprovision/lib/terraform/providers/vultr.rb | 2 +- src/vnm_mad/remotes/elastic/vultr_vnm.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ipamm_mad/remotes/vultr/register_address_range b/src/ipamm_mad/remotes/vultr/register_address_range index 9c8dce0393..83a0e0df65 100755 --- a/src/ipamm_mad/remotes/vultr/register_address_range +++ b/src/ipamm_mad/remotes/vultr/register_address_range @@ -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 diff --git a/src/ipamm_mad/remotes/vultr/unregister_address_range b/src/ipamm_mad/remotes/vultr/unregister_address_range index 895c07abad..e25f05a0d8 100755 --- a/src/ipamm_mad/remotes/vultr/unregister_address_range +++ b/src/ipamm_mad/remotes/vultr/unregister_address_range @@ -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 diff --git a/src/oneprovision/lib/terraform/providers/vultr.rb b/src/oneprovision/lib/terraform/providers/vultr.rb index bd6a64e674..db9fb8761f 100644 --- a/src/oneprovision/lib/terraform/providers/vultr.rb +++ b/src/oneprovision/lib/terraform/providers/vultr.rb @@ -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 diff --git a/src/vnm_mad/remotes/elastic/vultr_vnm.rb b/src/vnm_mad/remotes/elastic/vultr_vnm.rb index a453e059ec..b54f0e56ff 100644 --- a/src/vnm_mad/remotes/elastic/vultr_vnm.rb +++ b/src/vnm_mad/remotes/elastic/vultr_vnm.rb @@ -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