From 067e3f9fbf821754243334d12f096b610de446ad Mon Sep 17 00:00:00 2001 From: anthony Date: Fri, 4 Nov 2011 11:57:24 -0700 Subject: [PATCH] bug 11903: create local link when host is connected status 11903: resolved fixed --- .../xen/resource/CitrixResourceBase.java | 2 ++ .../hypervisor/xenserver/cloud-prepare-upgrade.sh | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 60b58e603bd..00c8efb9cba 100755 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -2517,6 +2517,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe // snapshots dir fails, let Ready command // succeed. callHostPlugin(conn, "vmopsSnapshot", "unmountSnapshotsDir", "dcId", dcId.toString()); + + setupLinkLocalNetwork(conn); _localGateway = callHostPlugin(conn, "vmops", "getgateway", "mgmtIP", _host.ip); if (_localGateway == null || _localGateway.isEmpty()) { diff --git a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh index d5197bc1919..0480c8f8de5 100755 --- a/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh +++ b/scripts/vm/hypervisor/xenserver/cloud-prepare-upgrade.sh @@ -27,20 +27,6 @@ do done done - -# propagates local link network -local_networkname="cloud_link_local_network" -local_network=$(xe network-list name-label=$local_networkname --minimal) -for dom0 in $(xe vm-list is-control-domain=true | grep ^uuid | awk '{print $NF}') -do - local_vif=$(xe vif-list vm-uuid=$dom0 network-name-label=$local_networkname | grep ^uuid | awk '{print $NF}') - if [ -z $local_vif ]; then - local_vif=$(xe vif-create network-uuid=$local_network vm-uuid=$dom0 device=0 mac=fe:ff:ff:ff:ff:ff) - xe vif-param-set uuid=$local_vif other-config:nameLabel=link_local_network_vif - xe vif-plug uuid=$local_vif - fi -done - # eject all CD