From aac2fcc3651cdc0be2871fc91d0287c66cdd1e37 Mon Sep 17 00:00:00 2001 From: Angel Luis Moya Gonzalez Date: Wed, 1 Apr 2020 16:12:05 +0200 Subject: [PATCH] F #4119: Fix vntemplate instantiate on vCenter (#4465) (cherry picked from commit f965b03163b823900d0dce29fdb0abe3ea3f8b62) --- install.sh | 3 ++- share/hooks/vcenter/create_vcenter_net.rb | 4 ++-- share/hooks/vcenter/delete_vcenter_net.rb | 2 +- share/hooks/vcenter/templates/instantiate_vcenter_net.tmpl | 6 ++++++ 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 share/hooks/vcenter/templates/instantiate_vcenter_net.tmpl diff --git a/install.sh b/install.sh index f0d5638be9..1699027205 100755 --- a/install.sh +++ b/install.sh @@ -1720,7 +1720,8 @@ HOOK_VCENTER_FILES="share/hooks/vcenter/create_vcenter_net.rb \ #------------------------------------------------------------------------------- HOOK_VCENTER_TMPLS="share/hooks/vcenter/templates/create_vcenter_net.tmpl \ - share/hooks/vcenter/templates/delete_vcenter_net.tmpl" + share/hooks/vcenter/templates/delete_vcenter_net.tmpl \ + share/hooks/vcenter/templates/instantiate_vcenter_net.tmpl" #------------------------------------------------------------------------------- # HOOK RAFT scripts, to be installed under $VAR_LOCATION/remotes/hooks/raft diff --git a/share/hooks/vcenter/create_vcenter_net.rb b/share/hooks/vcenter/create_vcenter_net.rb index cb5c81497f..18e3998073 100755 --- a/share/hooks/vcenter/create_vcenter_net.rb +++ b/share/hooks/vcenter/create_vcenter_net.rb @@ -78,7 +78,7 @@ def create_dpg(one_vnet, dc, cluster, vi_client) begin # Get parameters needed to create the network pnics = one_vnet['TEMPLATE/PHYDEV'] - pg_name = one_vnet['TEMPLATE/BRIDGE'] + pg_name = one_vnet['NAME'] sw_name = one_vnet['TEMPLATE/VCENTER_SWITCH_NAME'] mtu = one_vnet['TEMPLATE/MTU'] vlan_id = one_vnet['VLAN_ID'] || 0 @@ -149,7 +149,7 @@ def create_pg(one_vnet, esx_host) begin # Get parameters needed to create the network pnics = one_vnet['TEMPLATE/PHYDEV'] - pg_name = one_vnet['TEMPLATE/BRIDGE'] + pg_name = one_vnet['NAME'] sw_name = one_vnet['TEMPLATE/VCENTER_SWITCH_NAME'] mtu = one_vnet['TEMPLATE/MTU'] vlan_id = one_vnet['VLAN_ID'] || 0 diff --git a/share/hooks/vcenter/delete_vcenter_net.rb b/share/hooks/vcenter/delete_vcenter_net.rb index 3cdc105018..c8b62e27b7 100755 --- a/share/hooks/vcenter/delete_vcenter_net.rb +++ b/share/hooks/vcenter/delete_vcenter_net.rb @@ -92,7 +92,7 @@ begin raise 'Missing VCENTER_ONE_HOST_ID' unless host_id network_id = template['ID'] - pg_name = template['TEMPLATE/BRIDGE'] + pg_name = template['NAME'] pg_type = template['TEMPLATE/VCENTER_PORTGROUP_TYPE'] sw_name = template['TEMPLATE/VCENTER_SWITCH_NAME'] diff --git a/share/hooks/vcenter/templates/instantiate_vcenter_net.tmpl b/share/hooks/vcenter/templates/instantiate_vcenter_net.tmpl new file mode 100644 index 0000000000..43f9e61e7d --- /dev/null +++ b/share/hooks/vcenter/templates/instantiate_vcenter_net.tmpl @@ -0,0 +1,6 @@ +NAME = vcenter_net_instantiate +TYPE = api +COMMAND = vcenter/create_vcenter_net.rb +CALL = "one.vntemplate.instantiate" +ARGUMENTS = "$API" +ARGUMENTS_STDIN = yes