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

Adding some info to the update_config.py

Browse Source
This commit is contained in:
wilderrodrigues 2015-01-15 11:33:30 +01:00
parent edd839ab10
commit 2bb79b8115
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
View File

@ -7162,7 +7162,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
// Wilder Rodrigues - replaced this code with the code above.
// final VIF vif = getVifByMac(conn, vm, nic.getMac());
// VIF vif = getVifByMac(conn, vm, nic.getMac());
// if (vif != null) {
// final String msg = " Plug Nic failed due to a VIF with the same mac " + nic.getMac() + " exists";
// s_logger.warn(msg);

12
systemvm/patches/debian/config/opt/cloud/bin/update_config.py
View File

@ -79,9 +79,7 @@ def is_guestnet_configured(guestnet_dict, key):
if not new_eth_key:
'''
Why is the new guest net dictionary empty?
1. It might be setting up a single VPC, no need to continue.
2. Did we get any RTNETLINK error? If so, it might be trying to unplug the Guest Net NIC. Let's not allow it for now.
3. Might be a bug on the Java side.
1. Might be a bug on the Java side.
Return True so we won't process an empty file. However, we have to investigate it!
'''
return True
@ -117,9 +115,13 @@ if sys.argv[1] == "guest_network.json":
file = open(currentGuestNetConfig)
guestnet_dict = json.load(file)
if not is_guestnet_configured(guestnet_dict, ['eth1', 'eth2', 'eth3']):
if not is_guestnet_configured(guestnet_dict, ['eth1', 'eth2', 'eth3', 'eth4', 'eth5']):
process_file()
else:
finish_config()
print "[INFO] No need to process Guest Network."
finish_config()
else:
print "[INFO] No GuestNetwork configured yet. Configuring first one now."
process_file()
else:
process_file()