You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/02/16 17:47:47 UTC
[06/50] [abbrv] git commit: updated
refs/heads/feature/systemvm-persistent-config to 8620642
Adding some info to the update_config.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/355b850d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/355b850d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/355b850d
Branch: refs/heads/feature/systemvm-persistent-config
Commit: 355b850d00a8b572067de3fcd2ce347cb008e79d
Parents: afb2632
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Thu Jan 15 11:33:30 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Feb 16 16:08:35 2015 +0100
----------------------------------------------------------------------
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../debian/config/opt/cloud/bin/update_config.py | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/355b850d/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index b156d50..c335572 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -7147,7 +7147,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);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/355b850d/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
index 75e0c85..8bb5916 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/update_config.py
@@ -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()
\ No newline at end of file