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

B #3189: Add missing sudo for lxd_clean hook. Change install location of lxd clean hook

Browse Source
This commit is contained in:
Ruben S. Montero 2019-10-02 16:49:32 +02:00
parent a4e0eee4fb
commit eb2bc22ef4
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install.sh
View File

@ -224,6 +224,7 @@ fi
SHARE_DIRS="$SHARE_LOCATION/examples \
$SHARE_LOCATION/examples/alias_ip \
$SHARE_LOCATION/examples/host_hooks \
$SHARE_LOCATION/examples/network_hooks \
$SHARE_LOCATION/websockify \
$SHARE_LOCATION/websockify/websockify \
$SHARE_LOCATION/esx-fw-vnc \
@ -515,26 +516,19 @@ INSTALL_FILES=(
NETWORK_FILES:$VAR_LOCATION/remotes/vnm
NETWORK_ETC_FILES:$VAR_LOCATION/remotes/etc/vnm
NETWORK_8021Q_FILES:$VAR_LOCATION/remotes/vnm/802.1Q
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/802.1Q/clean.d
NETWORK_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/vxlan
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/vxlan/clean.d
NETWORK_DUMMY_FILES:$VAR_LOCATION/remotes/vnm/dummy
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/dummy/clean.d
NETWORK_BRIDGE_FILES:$VAR_LOCATION/remotes/vnm/bridge
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/bridge/clean.d
NETWORK_EBTABLES_FILES:$VAR_LOCATION/remotes/vnm/ebtables
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/ebtables/clean.d
NETWORK_FW_FILES:$VAR_LOCATION/remotes/vnm/fw
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/fw/clean.d
NETWORK_OVSWITCH_FILES:$VAR_LOCATION/remotes/vnm/ovswitch
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/ovswitch/clean.d
NETWORK_OVSWITCH_VXLAN_FILES:$VAR_LOCATION/remotes/vnm/ovswitch_vxlan
NETWORK_LXD_FILES:$VAR_LOCATION/remotes/vnm/ovswitch_vxlan/clean.d
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
WEBSOCKIFY_SHARE_MODULE_FILES:$SHARE_LOCATION/websockify/websockify
ESX_FW_VNC_SHARE_FILES:$SHARE_LOCATION/esx-fw-vnc
@ -1202,8 +1196,6 @@ NETWORK_ALIAS_SDNAT_FILES="src/vnm_mad/remotes/alias_sdnat/AliasSDNAT.rb \
src/vnm_mad/remotes/alias_sdnat/pre \
src/vnm_mad/remotes/alias_sdnat/update_sg "
NETWORK_LXD_FILES="src/vnm_mad/remotes/lib/lxd_clean.rb"
#-------------------------------------------------------------------------------
# Virtual Network Manager drivers configuration to be installed under $REMOTES_LOCATION/etc/vnm
#-------------------------------------------------------------------------------
@ -1670,6 +1662,12 @@ EXAMPLE_DDC_SHARE_FILES="share/examples/alias_ip/running_hook \
EXAMPLE_HOST_HOOKS_SHARE_FILES="share/examples/host_hooks/error_hook"
#-------------------------------------------------------------------------------
# LXD network issues vnm hook patches
#-------------------------------------------------------------------------------
LXD_NETWORK_HOOKS="share/examples/network_hooks/99-lxd_clean.rb"
#-------------------------------------------------------------------------------
# Files required to interact with the websockify server
#-------------------------------------------------------------------------------

2
src/vnm_mad/remotes/lib/lxd_clean.rb → share/examples/network_hooks/99-lxd_clean.rb Normal file → Executable file
View File

@ -24,7 +24,7 @@ vm.nics.each do |nic|
next unless s == 0
cmd = "ip link delete #{veth}"
cmd = "sudo ip link delete #{veth}"
OpenNebula.log "Found lingering nic #{veth}\n Running #{cmd}"
o, e, _s = Open3.capture3(cmd)