@@ -282,12 +282,6 @@ func getEdgeNodeDeploymentConfigSchema() *schema.Schema {
282
282
Optional : true ,
283
283
Description : "Host identifier in the specified vcenter server" ,
284
284
},
285
- "ipv4_assignment_enabled" : {
286
- Type : schema .TypeBool ,
287
- Description : "This flag represents whether IPv4 configuration is enabled or not" ,
288
- Optional : true ,
289
- Default : true ,
290
- },
291
285
"management_network_id" : {
292
286
Type : schema .TypeString ,
293
287
Required : true ,
@@ -994,7 +988,6 @@ func getEdgeNodeDeploymentConfigFromSchema(cfg interface{}) (*model.EdgeNodeDepl
994
988
dataNetworkIds := interface2StringList (vdc ["data_network_ids" ].([]interface {}))
995
989
defaultGatewayAddresses := interface2StringList (vdc ["default_gateway_address" ].([]interface {}))
996
990
hostID := vdc ["host_id" ].(string )
997
- ipv4AssignmentEnabled := vdc ["ipv4_assignment_enabled" ].(bool )
998
991
managementNetworkID := vdc ["management_network_id" ].(string )
999
992
var managemenPortSubnets []model.IPSubnet
1000
993
for _ , ipsi := range vdc ["management_port_subnet" ].([]interface {}) {
@@ -1030,7 +1023,6 @@ func getEdgeNodeDeploymentConfigFromSchema(cfg interface{}) (*model.EdgeNodeDepl
1030
1023
ComputeId : & computeID ,
1031
1024
DataNetworkIds : dataNetworkIds ,
1032
1025
HostId : & hostID ,
1033
- Ipv4AssignmentEnabled : & ipv4AssignmentEnabled ,
1034
1026
ManagementNetworkId : & managementNetworkID ,
1035
1027
ManagementPortSubnets : managemenPortSubnets ,
1036
1028
ReservationInfo : reservationInfo ,
@@ -1204,18 +1196,22 @@ func getEdgeNodeSettingsFromSchema(s interface{}) (*model.EdgeNodeSettings, erro
1204
1196
Server : & server ,
1205
1197
})
1206
1198
}
1207
- return & model.EdgeNodeSettings {
1199
+ obj := & model.EdgeNodeSettings {
1208
1200
AdvancedConfiguration : advCfg ,
1209
1201
AllowSshRootLogin : & allowSSHRootLogin ,
1210
1202
DnsServers : dnsServers ,
1211
1203
EnableSsh : & enableSSH ,
1212
- EnableUptMode : & enableUptMode ,
1213
1204
Hostname : & hostName ,
1214
1205
NtpServers : ntpServers ,
1215
1206
SearchDomains : searchDomains ,
1216
1207
SyslogServers : syslogServers ,
1217
- }, nil
1208
+ }
1209
+ if nsxVersionHigherOrEqual ("4.0.0" ) {
1210
+ obj .EnableUptMode = & enableUptMode
1211
+ }
1212
+ return obj , nil
1218
1213
}
1214
+
1219
1215
return nil , nil
1220
1216
}
1221
1217
@@ -1762,7 +1758,6 @@ func setVMDeploymentConfigInSchema(config *data.StructValue) (interface{}, error
1762
1758
elem ["data_network_ids" ] = vSphereCfg .DataNetworkIds
1763
1759
elem ["default_gateway_address" ] = vSphereCfg .DefaultGatewayAddresses
1764
1760
elem ["host_id" ] = vSphereCfg .HostId
1765
- elem ["ipv4_assignment_enabled" ] = vSphereCfg .Ipv4AssignmentEnabled
1766
1761
elem ["management_network_id" ] = vSphereCfg .ManagementNetworkId
1767
1762
1768
1763
var mpSubnets []map [string ]interface {}
0 commit comments