Updated Branches: refs/heads/4.2-workplace 0a0e86d16 -> 81a40bef3
fixed typo Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81a40bef Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/81a40bef Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/81a40bef Branch: refs/heads/4.2-workplace Commit: 81a40bef30c8e3ebe44633dd2f306faf627fb8c1 Parents: 0a0e86d Author: Anthony Xu <[email protected]> Authored: Fri Nov 15 15:59:40 2013 -0800 Committer: Anthony Xu <[email protected]> Committed: Fri Nov 15 15:59:40 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 3 ++- scripts/vm/hypervisor/xenserver/cloud-plugin-generic | 4 ---- scripts/vm/hypervisor/xenserver/xcposs/cloud-plugin-generic | 4 ---- scripts/vm/hypervisor/xenserver/xenserver62/patch | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81a40bef/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 e6453df..4680e93 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 @@ -5179,7 +5179,8 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe com.trilead.ssh2.Session session = sshConnection.openSession(); - String cmd = "mkdir -p /opt/cloud/bin; mkdir -p /opt/cloud/tools; mkdir -p /var/log/cloud; mkdir -p /etc/cloud"; + String cmd = "mkdir -p /opt/cloud/bin; mkdir -p /opt/cloud/tools; mkdir -p /var/log/cloud;" + + " mkdir -p /etc/cloud; mkdir -p /var/run/cloud; mkdir -p /var/cache/cloud"; if (!SSHCmdHelper.sshExecuteCmd(sshConnection, cmd)) { throw new CloudRuntimeException("Cannot create directory /opt/cloud/bin on XenServer hosts"); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81a40bef/scripts/vm/hypervisor/xenserver/cloud-plugin-generic ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/cloud-plugin-generic b/scripts/vm/hypervisor/xenserver/cloud-plugin-generic index 16f2a50..e43638e 100644 --- a/scripts/vm/hypervisor/xenserver/cloud-plugin-generic +++ b/scripts/vm/hypervisor/xenserver/cloud-plugin-generic @@ -449,10 +449,6 @@ def can_bridge_firewall(session, args): return 'false' default_ebtables_rules() allow_egress_traffic(session) - if not os.path.exists('/var/run/cloud'): - os.makedirs('/var/run/cloud') - if not os.path.exists('/var/cache/cloud'): - os.makedirs('/var/cache/cloud') #get_ipset_keyword() cleanup_rules_for_dead_vms(session) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81a40bef/scripts/vm/hypervisor/xenserver/xcposs/cloud-plugin-generic ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xcposs/cloud-plugin-generic b/scripts/vm/hypervisor/xenserver/xcposs/cloud-plugin-generic index aca0fe1..7eb30b1 100644 --- a/scripts/vm/hypervisor/xenserver/xcposs/cloud-plugin-generic +++ b/scripts/vm/hypervisor/xenserver/xcposs/cloud-plugin-generic @@ -363,10 +363,6 @@ def can_bridge_firewall(session, args): return 'false' default_ebtables_rules() allow_egress_traffic(session) - if not os.path.exists('/var/run/cloud'): - os.makedirs('/var/run/cloud') - if not os.path.exists('/var/cache/cloud'): - os.makedirs('/var/cache/cloud') #get_ipset_keyword() cleanup_rules_for_dead_vms(session) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81a40bef/scripts/vm/hypervisor/xenserver/xenserver62/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xenserver62/patch b/scripts/vm/hypervisor/xenserver/xenserver62/patch index f32f183..02f33e8 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver62/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver62/patch @@ -37,7 +37,7 @@ cloud-plugin-generic=..,0755,/etc/xapi.d/plugins xen-ovs-vif-flows.rules=..,0644,/etc/udev/rules.d ovs-vif-flows.py=..,0755,/etc/xapi.d/plugins -cloud_plugin-lib.py=..,0755,/etc/xapi.d/plugins +cloud_plugin_lib.py=..,0755,/etc/xapi.d/plugins cloud-plugin-ovstunnel=..,0755,/etc/xapi.d/plugins cloud-plugin-snapshot=..,0755,/etc/xapi.d/plugins cloud-plugin-swiftxen=..,0755,/etc/xapi.d/plugins
