OS-4857 Make OS-2994 upgrade more likely to succeed when 'netmask' an…

…d 'gateway' are invalid Reviewed by: Josh Wilsdon <jwilsdon@joyent.com> Reviewed by: Josh Clulow <jmc@joyent.com>
nshalman · Oct 21, 2015 · 42a6ad0 · 42a6ad0
1 parent 21e446d
commit 42a6ad0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/vm/node_modules/VM.js b/src/vm/node_modules/VM.js
diff --git a/src/vm/sbin/vmadmd.js b/src/vm/sbin/vmadmd.js
@@ -2292,6 +2292,16 @@ function main()
                                 finishUpgrade(vmobj);
                                 return;
                             }
+
+                            /*
+                             * 'gateway' and 'netmask' used to not be checked
+                             * if 'ip' was 'dhcp', so delete them, in case they
+                             * contain invalid values.
+                             */
+                            if (nic.ip === 'dhcp') {
+                                delete nic.gateway;
+                                delete nic.netmask;
+                            }
                         }
 
                         mod_nic.upgradeNics(vmobj, function (nic_err) {