cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/4.2-workplace to 815b11f
Date Thu, 14 Nov 2013 23:48:24 GMT
Updated Branches:
  refs/heads/4.2-workplace 1148b6fed -> 815b11fce


NFS.SR introduce the nosubdir parameter when create a NFS.SR,
CloudStack Version is not needed any more for XS 6.2


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/815b11fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/815b11fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/815b11fc

Branch: refs/heads/4.2-workplace
Commit: 815b11fcefedc02daeee580e97e56b4068e96305
Parents: 1148b6f
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Thu Nov 14 15:47:08 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Thu Nov 14 15:47:08 2013 -0800

----------------------------------------------------------------------
 .../xen/resource/CitrixResourceBase.java        |  2 +
 .../xen/resource/XenServer620Resource.java      |  2 +-
 .../vm/hypervisor/xenserver/xenserver62/patch   | 76 ++++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/815b11fc/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 90ec6a4..94e0f59 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -6183,6 +6183,7 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
             path = path.replace("//", "/");
             deviceConfig.put("server", uri.getHost());
             deviceConfig.put("serverpath", path);
+            deviceConfig.put("nosubdir", "true");
             String name = UUID.nameUUIDFromBytes(new String(uri.getHost() + path).getBytes()).toString();
             if (!shared) {
                 Set<SR> srs = SR.getByNameLabel(conn, name);
@@ -6454,6 +6455,7 @@ public abstract class CitrixResourceBase implements ServerResource,
HypervisorRe
             }
             deviceConfig.put("server", server);
             deviceConfig.put("serverpath", serverpath);
+            deviceConfig.put("nosubdir", "true");
             Host host = Host.getByUuid(conn, _host.uuid);
             SR sr = SR.create(conn, host, deviceConfig, new Long(0), pool.getUuid(), Long.toString(pool.getId()),
SRType.NFS.toString(), "user", true,
                     new HashMap<String, String>());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/815b11fc/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
index 51d7cd0..805d72e 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
@@ -45,7 +45,7 @@ public class XenServer620Resource extends XenServer610Resource {
     @Override
     protected List<File> getPatchFiles() {
         List<File> files = new ArrayList<File>();
-        String patch = "scripts/vm/hypervisor/xenserver/xenserver60/patch";
+        String patch = "scripts/vm/hypervisor/xenserver/xenserver62/patch";
         String patchfilePath = Script.findScript("" , patch);
         if (patchfilePath == null) {
             throw new CloudRuntimeException("Unable to find patch file " + patch);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/815b11fc/scripts/vm/hypervisor/xenserver/xenserver62/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver62/patch b/scripts/vm/hypervisor/xenserver/xenserver62/patch
new file mode 100644
index 0000000..a98ca86
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/xenserver62/patch
@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# This file specifies the files that need
+# to be transferred over to the XenServer.
+# The format of this file is as follows:
+# [Name of file]=[source path],[file permission],[destination path]
+# [destination path] is required.
+# If [file permission] is missing, 755 is assumed.
+# If [source path] is missing, it looks in the same
+# directory as the patch file.
+# If [source path] starts with '/', then it is absolute path.
+# If [source path] starts with '~', then it is path relative to management server home directory.
+# If [source path] does not start with '/' or '~', then it is relative path to the location
of the patch file. 
+vmops=..,0755,/etc/xapi.d/plugins
+xen-ovs-vif-flows.rules=..,0644,/etc/udev/rules.d
+ovs-vif-flows.py=..,0755,/etc/xapi.d/plugins
+cloudstack_plugins.conf=..,0644,/etc/xensource
+cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
+ovstunnel=..,0755,/etc/xapi.d/plugins
+vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
+id_rsa.cloud=../../../systemvm,0600,/root/.ssh
+network_info.sh=..,0755,/opt/cloudstack/bin
+setupxenserver.sh=..,0755,/opt/cloudstack/bin
+make_migratable.sh=..,0755,/opt/cloudstack/bin
+createipAlias.sh=..,0755,/opt/cloudstack/bin
+deleteipAlias.sh=..,0755,/opt/cloudstack/bin
+setup_iscsi.sh=..,0755,/opt/cloudstack/bin
+pingtest.sh=../../..,0755,/opt/cloudstack/bin
+dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_firewall.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+cloud-setup-bonding.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloudstack/bin
+kill_copy_process.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_sr.sh=..,0755,/opt/cloudstack/bin
+setup_heartbeat_file.sh=..,0755,/opt/cloudstack/bin
+check_heartbeat.sh=..,0755,/opt/cloudstack/bin
+xenheartbeat.sh=..,0755,/opt/cloudstack/bin
+launch_hb.sh=..,0755,/opt/cloudstack/bin
+vhd-util=..,0755,/opt/cloudstack/bin
+vmopspremium=..,0755,/etc/xapi.d/plugins
+create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloudstack/bin
+upgrade_snapshot.sh=..,0755,/opt/cloudstack/bin
+cloud-clean-vlan.sh=..,0755,/opt/cloudstack/bin
+cloud-prepare-upgrade.sh=..,0755,/opt/cloudstack/bin
+bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloudstack/bin
+swift=..,0755,/opt/cloudstack/bin
+swiftxen=..,0755,/etc/xapi.d/plugins
+s3xen=..,0755,/etc/xapi.d/plugins
+add_to_vcpus_params_live.sh=..,0755,/opt/cloudstack/bin
+ovs-pvlan=..,0755,/etc/xapi.d/plugins
+ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloudstack/bin
+ovs-pvlan-vm.sh=../../../network,0755,/opt/cloudstack/bin
+ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloudstack/bin
+ovs-get-dhcp-iface.sh=..,0755,/opt/cloudstack/bin
+ovs-get-bridge.sh=..,0755,/opt/cloudstack/bin
+cloudstacklog=..,0644,/etc/logrotate.d


Mime
View raw message