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

Merge remote-tracking branch 'origin/4.12'

This commit is contained in:
Rohit Yadav 2019-06-05 10:06:08 +05:30
parent 50869fec92 ff23131701
commit 4d9206aef5
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/main/java/com/cloud/network/element/VirtualRouterElement.java
View File

@ -895,6 +895,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, RedundantResource, DnsServ
@Override @Override
public boolean release(final Network network, final NicProfile nic, final VirtualMachineProfile vm, final ReservationContext context) throws ConcurrentOperationException, public boolean release(final Network network, final NicProfile nic, final VirtualMachineProfile vm, final ReservationContext context) throws ConcurrentOperationException,
ResourceUnavailableException { ResourceUnavailableException {
removeDhcpEntry(network, nic, vm);
return true; return true;
} }

8
systemvm/debian/opt/cloud/bin/configure.py
View File

@ -922,11 +922,11 @@ class CsForwardingRules(CsDataBag):
if device is None: if device is None:
raise Exception("Ip address %s has no device in the ips databag" % rule["public_ip"]) raise Exception("Ip address %s has no device in the ips databag" % rule["public_ip"])
self.fw.append(["mangle", "", self.fw.append(["mangle", "front",
"-I PREROUTING -s %s/32 -m state --state NEW -j CONNMARK --save-mark --nfmask 0xffffffff --ctmask 0xffffffff" % "-A PREROUTING -s %s/32 -m state --state NEW -j CONNMARK --save-mark --nfmask 0xffffffff --ctmask 0xffffffff" %
rule["internal_ip"]]) rule["internal_ip"]])
self.fw.append(["mangle", "", self.fw.append(["mangle", "front",
"-I PREROUTING -s %s/32 -m state --state NEW -j MARK --set-xmark %s/0xffffffff" % "-A PREROUTING -s %s/32 -m state --state NEW -j MARK --set-xmark %s/0xffffffff" %
(rule["internal_ip"], hex(100 + int(device[len("eth"):])))]) (rule["internal_ip"], hex(100 + int(device[len("eth"):])))])
self.fw.append(["nat", "front", self.fw.append(["nat", "front",
"-A PREROUTING -d %s/32 -j DNAT --to-destination %s" % (rule["public_ip"], rule["internal_ip"])]) "-A PREROUTING -d %s/32 -j DNAT --to-destination %s" % (rule["public_ip"], rule["internal_ip"])])

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

@ -118,7 +118,6 @@ class CsDhcp(CsDataBag):
def delete_leases(self): def delete_leases(self):
macs_dhcphosts = [] macs_dhcphosts = []
interfaces = filter(lambda x: x.startswith('eth'), os.listdir('/sys/class/net'))
try: try:
logging.info("Attempting to delete entries from dnsmasq.leases file for VMs which are not on dhcphosts file") logging.info("Attempting to delete entries from dnsmasq.leases file for VMs which are not on dhcphosts file")
for host in open(DHCP_HOSTS): for host in open(DHCP_HOSTS):
@ -130,10 +129,9 @@ class CsDhcp(CsDataBag):
mac = lease[1] mac = lease[1]
ip = lease[2] ip = lease[2]
if mac not in macs_dhcphosts: if mac not in macs_dhcphosts:
for interface in interfaces: cmd = "dhcp_release $(ip route get %s | grep eth | head -1 | awk '{print $3}') %s %s" % (ip, ip, mac)
cmd = "dhcp_release %s %s %s" % (interface, ip, mac) logging.info(cmd)
logging.info(cmd) CsHelper.execute(cmd)
CsHelper.execute(cmd)
removed = removed + 1 removed = removed + 1
self.del_host(ip) self.del_host(ip)
logging.info("Deleted %s entries from dnsmasq.leases file" % str(removed)) logging.info("Deleted %s entries from dnsmasq.leases file" % str(removed))

5
systemvm/debian/opt/cloud/bin/cs_dhcp.py
View File

@ -27,11 +27,6 @@ def merge(dbag, data):
del(dbag[data['ipv4_address']]) del(dbag[data['ipv4_address']])
else: else:
remove_keys = set() remove_keys = set()
for key, entry in dbag.iteritems():
if key != 'id' and entry['host_name'] == data['host_name']:
remove_keys.add(key)
break
for key, entry in dbag.iteritems(): for key, entry in dbag.iteritems():
if key != 'id' and entry['mac_address'] == data['mac_address']: if key != 'id' and entry['mac_address'] == data['mac_address']:
remove_keys.add(key) remove_keys.add(key)