shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

M #-: decrypt provision info in IPAM (#438)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2020-11-18 12:51:12 +01:00 committed by GitHub
parent d2202b61f7
commit 325ff0a9f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install.sh
View File

@ -246,7 +246,6 @@ else
fi
SHARE_DIRS="$SHARE_LOCATION/examples \
$SHARE_LOCATION/examples/alias_ip \
$SHARE_LOCATION/examples/host_hooks \
$SHARE_LOCATION/examples/network_hooks \
$SHARE_LOCATION/websockify \
@ -436,7 +435,6 @@ VAR_DIRS="$VAR_LOCATION/remotes \
$VAR_LOCATION/remotes/hooks/vcenter \
$VAR_LOCATION/remotes/hooks/vcenter/templates \
$VAR_LOCATION/remotes/hooks/raft \
$VAR_LOCATION/remotes/hooks/alias_ip \
$VAR_LOCATION/remotes/datastore \
$VAR_LOCATION/remotes/datastore/dummy \
$VAR_LOCATION/remotes/datastore/fs \
@ -672,7 +670,6 @@ INSTALL_FILES=(
NETWORK_VCENTER_FILES:$VAR_LOCATION/remotes/vnm/vcenter
NETWORK_ALIAS_SDNAT_FILES:$VAR_LOCATION/remotes/vnm/alias_sdnat
EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples
EXAMPLE_DDC_SHARE_FILES:$SHARE_LOCATION/examples/alias_ip
EXAMPLE_HOST_HOOKS_SHARE_FILES:$SHARE_LOCATION/examples/host_hooks
LXD_NETWORK_HOOKS:$SHARE_LOCATION/examples/network_hooks
WEBSOCKIFY_SHARE_RUN_FILES:$SHARE_LOCATION/websockify
@ -685,7 +682,6 @@ INSTALL_FILES=(
HOOK_VCENTER_FILES:$VAR_LOCATION/remotes/hooks/vcenter
HOOK_VCENTER_TMPLS:$VAR_LOCATION/remotes/hooks/vcenter/templates
HOOK_RAFT_FILES:$VAR_LOCATION/remotes/hooks/raft
HOOK_ALIAS_IP_FILES:$VAR_LOCATION/remotes/hooks/alias_ip
COMMON_CLOUD_LIB_FILES:$LIB_LOCATION/ruby/cloud
CLOUD_AUTH_LIB_FILES:$LIB_LOCATION/ruby/cloud/CloudAuth
ECO_LIB_FILES:$LIB_LOCATION/ruby/cloud/econe
@ -1989,14 +1985,6 @@ EXAMPLE_SHARE_FILES="share/examples/vm.template \
share/examples/private.net \
share/examples/public.net"
#-------------------------------------------------------------------------------
# Sample files, to be installed under $SHARE_LOCATION/examples/alias_ip
#-------------------------------------------------------------------------------
EXAMPLE_DDC_SHARE_FILES="share/examples/alias_ip/running_hook \
share/examples/alias_ip/hotplug_hook \
share/examples/alias_ip/done_hook"
#-------------------------------------------------------------------------------
# Sample files, to be installed under $SHARE_LOCATION/examples/host_hooks
#-------------------------------------------------------------------------------
@ -2056,12 +2044,6 @@ HOOK_VCENTER_TMPLS="share/hooks/vcenter/templates/create_vcenter_net.tmpl \
HOOK_RAFT_FILES="share/hooks/raft/vip.sh"
#-------------------------------------------------------------------------------
# HOOK scripts, to be installed under $VAR_LOCATION/remotes/hooks/alias_ip
#-------------------------------------------------------------------------------
HOOK_ALIAS_IP_FILES="share/hooks/alias_ip/alias_ip.rb"
#-------------------------------------------------------------------------------
# Installation scripts, to be installed under $SHARE_LOCATION
#-------------------------------------------------------------------------------

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

@ -105,7 +105,7 @@ begin
one = OpenNebula::Client.new
provision = OneProvision::Provision.new_with_id(provision_id, one)
rc = provision.info
rc = provision.info(true)
if OpenNebula.is_error?(rc)
STDERR.puts rc.message

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

@ -81,7 +81,7 @@ begin
one = OpenNebula::Client.new
provision = OneProvision::Provision.new_with_id(provision_id, one)
rc = provision.info
rc = provision.info(true)
if OpenNebula.is_error?(rc)
STDERR.puts rc.message

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

@ -111,7 +111,7 @@ begin
one = OpenNebula::Client.new
provision = OneProvision::Provision.new_with_id(provision_id, one)
rc = provision.info
rc = provision.info(true)
if OpenNebula.is_error?(rc)
STDERR.puts rc.message

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

@ -76,7 +76,7 @@ begin
one = OpenNebula::Client.new
provision = OneProvision::Provision.new_with_id(provision_id, one)
rc = provision.info
rc = provision.info(true)
if OpenNebula.is_error?(rc)
STDERR.puts rc.message