F #4119: Fix vntemplate instantiate on vCenter (#4465)

(cherry picked from commit f965b03163)
This commit is contained in:
Angel Luis Moya Gonzalez authored and Tino Vazquez committed 2020-04-01 16:13:38 +02:00
1 parent 9167696709
commit aac2fcc365
4 files changed
+11 -4

No files matched your search

+2 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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']
@@ -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