Merge pull request #1788 from shapeblue/4.9-fix-merge-pr1766

systemvm: Fix regression from fwd-merging PR #1766Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766.

* pr/1788:
  systemvm: Fix regression from 825935

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py

@@ -137,15 +137,15 @@ def add(self, entry):
         if entry['default_entry'] == True:
             self.cloud.add("%s,%s,%s,%sh" % (entry['mac_address'],
                                              entry['ipv4_adress'],
-                                             entry['host_name']),
-                                             lease)
+                                             entry['host_name'],
+                                             lease))
         else:
             tag = entry['ipv4_adress'].replace(".","_")
             self.cloud.add("%s,set:%s,%s,%s,%sh" % (entry['mac_address'],
                                                     tag,
                                                     entry['ipv4_adress'],
-                                                    entry['host_name']),
-                                                    lease)
+                                                    entry['host_name'],
+                                                    lease))
             self.dhcp_opts.add("%s,%s" % (tag, 3))
             self.dhcp_opts.add("%s,%s" % (tag, 6))
             self.dhcp_opts.add("%s,%s" % (tag, 15))