etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rohit Yadav 2016-11-27 15:49:41 +05:30
parent 50f80cc2a0 cc72e4da64
commit 6a449e4b3b
No known key found for this signature in database
GPG Key ID: 484248210EE3D884
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,15 +137,15 @@ class CsDhcp(CsDataBag):
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))