From 234ae23443c06ad6bfc2d28f5b86f7603672f92a Mon Sep 17 00:00:00 2001
From: Pan Luo <pan.luo@ubc.ca>
Date: Thu, 4 May 2017 09:30:55 -0700
Subject: [PATCH] Change default value of dhcp for vmware template to no

When OVA template is not being used, the default dhcp value yes will
trigger cloud-init to generate a 00-.network file, which will break
network connectivity Intermittently. Please see the details here:
https://github.com/coreos/bugs/issues/1802#issuecomment-297847614
---
 build_library/template_vmware.ovf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_library/template_vmware.ovf b/build_library/template_vmware.ovf
index 22a2e48b69..1ae364055c 100644
--- a/build_library/template_vmware.ovf
+++ b/build_library/template_vmware.ovf
@@ -49,7 +49,7 @@
         <Description>MAC for network interface 0</Description>
       </Property>
       <Property ovf:userConfigurable="true" ovf:type="string"
-                ovf:key="guestinfo.interface.0.dhcp" ovf:value="yes">
+                ovf:key="guestinfo.interface.0.dhcp" ovf:value="no">
         <Label>DHCP support for network interface 0</Label>
         <Description>DHCP support for network interface 0</Description>
       </Property>
@@ -210,4 +210,4 @@
       <vmw:Config ovf:required="false" vmw:key="tools.toolsUpgradePolicy" vmw:value="manual"/>
     </VirtualHardwareSection>
   </VirtualSystem>
-</Envelope>                                 
+</Envelope>