shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-21 09:33:53 +03:00
Code Releases Wiki Activity

F #6756: Fix for Scaleway driver

Browse Source 
- Missing files in install.sh
- Fix bug in unregister_address_range
This commit is contained in:
Ruben S. Montero 2024-12-09 01:08:21 +01:00
parent 450563d408
commit d546ed3db3
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@ -1726,6 +1726,15 @@ IPAM_DRIVER_EQUINIX_SCRIPTS="src/ipamm_mad/remotes/equinix/register_address_rang
src/ipamm_mad/remotes/equinix/get_address \ src/ipamm_mad/remotes/equinix/get_address \
src/ipamm_mad/remotes/equinix/free_address" src/ipamm_mad/remotes/equinix/free_address"
#-------------------------------------------------------------------------------
# IPAM Scaleway drivers to be installed under $REMOTES_LOCATION/ipam
#-------------------------------------------------------------------------------
IPAM_DRIVER_SCALEWAY_SCRIPTS="src/ipamm_mad/remotes/scaleway/register_address_range \
src/ipamm_mad/remotes/scaleway/unregister_address_range \
src/ipamm_mad/remotes/scaleway/allocate_address \
src/ipamm_mad/remotes/scaleway/get_address \
src/ipamm_mad/remotes/scaleway/free_address"
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# IPAM Vultr drivers to be installed under $REMOTES_LOCATION/ipam # IPAM Vultr drivers to be installed under $REMOTES_LOCATION/ipam
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

6
src/ipamm_mad/remotes/scaleway/unregister_address_range
View File

@ -94,8 +94,8 @@ begin
provider = provision.provider provider = provision.provider
connect = provider.body['connection'] connect = provider.body['connection']
sw_token = connect['token'] sw_secret_key = connect['secret_key']
sw_zone = provider.body['zone'] sw_zone = connect['zone']
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Connect to Scaleway and delete the Flexible IP # Connect to Scaleway and delete the Flexible IP
@ -108,7 +108,7 @@ begin
exit(-1) exit(-1)
end end
sw = Scaleway.new(sw_token) sw = Scaleway.new(sw_secret_key)
resp = sw.api_call("/flexible-ip/v1alpha1/zones/#{sw_zone}/fips/#{scaleway_id}", resp = sw.api_call("/flexible-ip/v1alpha1/zones/#{sw_zone}/fips/#{scaleway_id}",
Net::HTTP::Delete) Net::HTTP::Delete)