From fadb5e9b4bcbdfa38912019483ba8d04b60cf55b Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Wed, 2 Oct 2019 09:33:59 -0500 Subject: [PATCH] B #3189: Change lxd_clean install --- install.sh | 17 +++++++---------- .../examples/network_hooks}/lxd_clean.rb | 0 2 files changed, 7 insertions(+), 10 deletions(-) rename {src/vnm_mad/remotes/lib => share/examples/network_hooks}/lxd_clean.rb (100%) mode change 100644 => 100755 diff --git a/install.sh b/install.sh index 4a71206c093..b396ad685df 100755 --- a/install.sh +++ b/install.sh @@ -515,26 +515,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 +1195,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 +1661,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/lxd_clean.rb" + #------------------------------------------------------------------------------- # Files required to interact with the websockify server #------------------------------------------------------------------------------- diff --git a/src/vnm_mad/remotes/lib/lxd_clean.rb b/share/examples/network_hooks/lxd_clean.rb old mode 100644 new mode 100755 similarity index 100% rename from src/vnm_mad/remotes/lib/lxd_clean.rb rename to share/examples/network_hooks/lxd_clean.rb