Skip to content

Commit d77d1a7

Browse files
Daan HooglandDaanHoogland
authored andcommitted
make vlan check conditional on management network for xen
1 parent 5e5ae0c commit d77d1a7

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixSetupCommandWrapper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ public Answer execute(final SetupCommand command, final CitrixResourceBase citri
104104
for (final PIF pif : hostPifs) {
105105
final PIF.Record rec = pif.getRecord(conn);
106106
if (rec.management) {
107-
if (rec.VLAN != null && rec.VLAN != -1) {
107+
if (host.getAPIVersionMajor(conn) < 8 && rec.VLAN != null && rec.VLAN != -1) {
108108
final String msg =
109109
new StringBuilder("Unsupported configuration. Management network is on a VLAN. host=").append(citrixResourceBase.getHost().getUuid())
110-
.append("; pif=")
111-
.append(rec.uuid)
112-
.append("; vlan=")
113-
.append(rec.VLAN)
114-
.toString();
110+
.append("; pif=")
111+
.append(rec.uuid)
112+
.append("; vlan=")
113+
.append(rec.VLAN)
114+
.toString();
115115
logger.warn(msg);
116116
return new SetupAnswer(command, msg);
117117
}

0 commit comments

Comments
 (0)