From 5fed4f41d7e21c37879335ca2dfde0cfd93935c9 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Mon, 26 Oct 2015 17:40:53 +0100 Subject: [PATCH] Rename xapi plugins for s3 and swift to make them work after renaming the calls Renaming introduced in a8212d9ef458dd7ac64b021e6fa33fcf64b3cce0 This PR is to address comments in PR #970 --- scripts/vm/hypervisor/xenserver/cloudlog | 2 +- scripts/vm/hypervisor/xenserver/{s3xen => s3xenserver} | 2 +- .../vm/hypervisor/xenserver/{swiftxen => swiftxenserver} | 2 +- scripts/vm/hypervisor/xenserver/xenserver56/patch | 6 +++--- scripts/vm/hypervisor/xenserver/xenserver56fp1/patch | 6 +++--- scripts/vm/hypervisor/xenserver/xenserver60/patch | 6 +++--- scripts/vm/hypervisor/xenserver/xenserver62/patch | 6 +++--- scripts/vm/hypervisor/xenserver/xenserver65/patch | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) rename scripts/vm/hypervisor/xenserver/{s3xen => s3xenserver} (99%) rename scripts/vm/hypervisor/xenserver/{swiftxen => swiftxenserver} (98%) diff --git a/scripts/vm/hypervisor/xenserver/cloudlog b/scripts/vm/hypervisor/xenserver/cloudlog index ea84312de05..ed7e6908ad7 100644 --- a/scripts/vm/hypervisor/xenserver/cloudlog +++ b/scripts/vm/hypervisor/xenserver/cloudlog @@ -29,7 +29,7 @@ rotate 20 } -/var/log/cloud/ovstunnel.log /var/log/cloud/ovs-pvlan.log /var/log/cloud/swiftxenserver.log /var/log/cloud/s3xenserver /var/log/cloud/storageplugin { +/var/log/cloud/ovstunnel.log /var/log/cloud/ovs-pvlan.log /var/log/cloud/swiftxenserver.log /var/log/cloud/s3xenserver.log /var/log/cloud/storageplugin { daily size 1M rotate 2 diff --git a/scripts/vm/hypervisor/xenserver/s3xen b/scripts/vm/hypervisor/xenserver/s3xenserver similarity index 99% rename from scripts/vm/hypervisor/xenserver/s3xen rename to scripts/vm/hypervisor/xenserver/s3xenserver index ccd7ce51f27..d0cea6c693b 100644 --- a/scripts/vm/hypervisor/xenserver/s3xen +++ b/scripts/vm/hypervisor/xenserver/s3xenserver @@ -42,7 +42,7 @@ import util import cloudstack_pluginlib as lib import logging -lib.setup_logging("/var/log/cloud/s3xen.log") +lib.setup_logging("/var/log/cloud/s3xenserver.log") NULL = 'null' diff --git a/scripts/vm/hypervisor/xenserver/swiftxen b/scripts/vm/hypervisor/xenserver/swiftxenserver similarity index 98% rename from scripts/vm/hypervisor/xenserver/swiftxen rename to scripts/vm/hypervisor/xenserver/swiftxenserver index f56d5ad7ff0..b0be24f5efe 100644 --- a/scripts/vm/hypervisor/xenserver/swiftxen +++ b/scripts/vm/hypervisor/xenserver/swiftxenserver @@ -27,7 +27,7 @@ import util import cloudstack_pluginlib as lib import logging -lib.setup_logging("/var/log/cloud/swiftxen.log") +lib.setup_logging("/var/log/cloud/swiftxenserver.log") def echo(fn): def wrapped(*v, **k): diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch index 23da0f37172..b6f7cdbb5c1 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver56/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch @@ -55,12 +55,12 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin cloud-clean-vlan.sh=..,0755,/opt/cloud/bin cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin swift=..,0755,/opt/cloud/bin -swiftxen=..,0755,/etc/xapi.d/plugins -s3xen=..,0755,/etc/xapi.d/plugins +swiftxenserver=..,0755,/etc/xapi.d/plugins +s3xenserver=..,0755,/etc/xapi.d/plugins add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin ###add cloudstack plugin script for XCP cloudstack_plugins.conf=..,0644,/etc/xensource cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch index a67224f8306..4546796f9b3 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch @@ -54,12 +54,12 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin cloud-clean-vlan.sh=..,0755,/opt/cloud/bin cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin swift=..,0755,/opt/cloud/bin -swiftxen=..,0755,/etc/xapi.d/plugins -s3xen=..,0755,/etc/xapi.d/plugins +swiftxenserver=..,0755,/etc/xapi.d/plugins +s3xenserver=..,0755,/etc/xapi.d/plugins add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin ###add cloudstack plugin script for XCP cloudstack_plugins.conf=..,0644,/etc/xensource cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch index cf2f03e0f3c..4b0973f918d 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver60/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch @@ -58,8 +58,8 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin cloud-clean-vlan.sh=..,0755,/opt/cloud/bin cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin swift=..,0755,/opt/cloud/bin -swiftxen=..,0755,/etc/xapi.d/plugins -s3xen=..,0755,/etc/xapi.d/plugins +swiftxenserver=..,0755,/etc/xapi.d/plugins +s3xenserver=..,0755,/etc/xapi.d/plugins add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin ovs-pvlan=..,0755,/etc/xapi.d/plugins ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloud/bin @@ -68,4 +68,4 @@ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin ovs-get-bridge.sh=..,0755,/opt/cloud/bin cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin diff --git a/scripts/vm/hypervisor/xenserver/xenserver62/patch b/scripts/vm/hypervisor/xenserver/xenserver62/patch index 11d979de9c4..8f65877da8c 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver62/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver62/patch @@ -54,8 +54,8 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin cloud-clean-vlan.sh=..,0755,/opt/cloud/bin cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin swift=..,0755,/opt/cloud/bin -swiftxen=..,0755,/etc/xapi.d/plugins -s3xen=..,0755,/etc/xapi.d/plugins +swiftxenserver=..,0755,/etc/xapi.d/plugins +s3xenserver=..,0755,/etc/xapi.d/plugins add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin ovs-pvlan=..,0755,/etc/xapi.d/plugins ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloud/bin @@ -64,4 +64,4 @@ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin ovs-get-bridge.sh=..,0755,/opt/cloud/bin cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin diff --git a/scripts/vm/hypervisor/xenserver/xenserver65/patch b/scripts/vm/hypervisor/xenserver/xenserver65/patch index 11d979de9c4..8f65877da8c 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver65/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver65/patch @@ -54,8 +54,8 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin cloud-clean-vlan.sh=..,0755,/opt/cloud/bin cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin swift=..,0755,/opt/cloud/bin -swiftxen=..,0755,/etc/xapi.d/plugins -s3xen=..,0755,/etc/xapi.d/plugins +swiftxenserver=..,0755,/etc/xapi.d/plugins +s3xenserver=..,0755,/etc/xapi.d/plugins add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin ovs-pvlan=..,0755,/etc/xapi.d/plugins ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloud/bin @@ -64,4 +64,4 @@ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin ovs-get-bridge.sh=..,0755,/opt/cloud/bin cloudlog=..,0644,/etc/logrotate.d -update_host_passwd.sh=../..,0755,/opt/cloud/bin \ No newline at end of file +update_host_passwd.sh=../..,0755,/opt/cloud/bin