apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

systemvm: Fix regression from 825935

Browse Source 
Fixes merge conflict issue incorrectly fixed during a fwd-merge in 825935
from PR #1766

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2016-11-27 15:43:10 +05:30
parent 50f80cc2a0
commit cc72e4da64
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: if entry['default_entry'] == True:
self.cloud.add("%s,%s,%s,%sh" % (entry['mac_address'], self.cloud.add("%s,%s,%s,%sh" % (entry['mac_address'],
entry['ipv4_adress'], entry['ipv4_adress'],
entry['host_name']), entry['host_name'],
lease) lease))
else: else:
tag = entry['ipv4_adress'].replace(".","_") tag = entry['ipv4_adress'].replace(".","_")
self.cloud.add("%s,set:%s,%s,%s,%sh" % (entry['mac_address'], self.cloud.add("%s,set:%s,%s,%s,%sh" % (entry['mac_address'],
tag, tag,
entry['ipv4_adress'], entry['ipv4_adress'],
entry['host_name']), entry['host_name'],
lease) lease))
self.dhcp_opts.add("%s,%s" % (tag, 3)) self.dhcp_opts.add("%s,%s" % (tag, 3))
self.dhcp_opts.add("%s,%s" % (tag, 6)) self.dhcp_opts.add("%s,%s" % (tag, 6))
self.dhcp_opts.add("%s,%s" % (tag, 15)) self.dhcp_opts.add("%s,%s" % (tag, 15))