Skip to content

Commit ab749ed

Browse files
remibergsmaremibergsma
committed
Merge pull request apache#982 from remibergsma/fix-s3-swift
CLOUDSTACK-9014 Rename xapi plugins for s3 and swift to make them work after renaming the callsMake renaming introduced in a8212d9 work for S3 and Swift xapi plugins. This PR is to address comments in PR apache#970 * pr/982: Rename xapi plugins for s3 and swift to make them work after renaming the calls Signed-off-by: Remi Bergsma <[email protected]>
2 parents bc5a5d6 + 5fed4f4 commit ab749ed

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎scripts/vm/hypervisor/xenserver/cloudlog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
rotate 20
3030
}
3131

32-
/var/log/cloud/ovstunnel.log /var/log/cloud/ovs-pvlan.log /var/log/cloud/swiftxenserver.log /var/log/cloud/s3xenserver /var/log/cloud/storageplugin {
32+
/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 {
3333
daily
3434
size 1M
3535
rotate 2

scripts/vm/hypervisor/xenserver/s3xen renamed to scripts/vm/hypervisor/xenserver/s3xenserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import util
4242
import cloudstack_pluginlib as lib
4343
import logging
4444

45-
lib.setup_logging("/var/log/cloud/s3xen.log")
45+
lib.setup_logging("/var/log/cloud/s3xenserver.log")
4646

4747
NULL = 'null'
4848

scripts/vm/hypervisor/xenserver/swiftxen renamed to scripts/vm/hypervisor/xenserver/swiftxenserver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import util
2727
import cloudstack_pluginlib as lib
2828
import logging
2929

30-
lib.setup_logging("/var/log/cloud/swiftxen.log")
30+
lib.setup_logging("/var/log/cloud/swiftxenserver.log")
3131

3232
def echo(fn):
3333
def wrapped(*v, **k):

‎scripts/vm/hypervisor/xenserver/xenserver56/patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin
5555
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
5656
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
5757
swift=..,0755,/opt/cloud/bin
58-
swiftxen=..,0755,/etc/xapi.d/plugins
59-
s3xen=..,0755,/etc/xapi.d/plugins
58+
swiftxenserver=..,0755,/etc/xapi.d/plugins
59+
s3xenserver=..,0755,/etc/xapi.d/plugins
6060
add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin
6161

6262
###add cloudstack plugin script for XCP
6363
cloudstack_plugins.conf=..,0644,/etc/xensource
6464
cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
6565
cloudlog=..,0644,/etc/logrotate.d
66-
update_host_passwd.sh=../..,0755,/opt/cloud/bin
66+
update_host_passwd.sh=../..,0755,/opt/cloud/bin

‎scripts/vm/hypervisor/xenserver/xenserver56fp1/patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin
5454
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
5555
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
5656
swift=..,0755,/opt/cloud/bin
57-
swiftxen=..,0755,/etc/xapi.d/plugins
58-
s3xen=..,0755,/etc/xapi.d/plugins
57+
swiftxenserver=..,0755,/etc/xapi.d/plugins
58+
s3xenserver=..,0755,/etc/xapi.d/plugins
5959
add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin
6060

6161
###add cloudstack plugin script for XCP
6262
cloudstack_plugins.conf=..,0644,/etc/xensource
6363
cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
6464
cloudlog=..,0644,/etc/logrotate.d
65-
update_host_passwd.sh=../..,0755,/opt/cloud/bin
65+
update_host_passwd.sh=../..,0755,/opt/cloud/bin

‎scripts/vm/hypervisor/xenserver/xenserver60/patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin
5858
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
5959
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
6060
swift=..,0755,/opt/cloud/bin
61-
swiftxen=..,0755,/etc/xapi.d/plugins
62-
s3xen=..,0755,/etc/xapi.d/plugins
61+
swiftxenserver=..,0755,/etc/xapi.d/plugins
62+
s3xenserver=..,0755,/etc/xapi.d/plugins
6363
add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin
6464
ovs-pvlan=..,0755,/etc/xapi.d/plugins
6565
ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloud/bin
@@ -68,4 +68,4 @@ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin
6868
ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin
6969
ovs-get-bridge.sh=..,0755,/opt/cloud/bin
7070
cloudlog=..,0644,/etc/logrotate.d
71-
update_host_passwd.sh=../..,0755,/opt/cloud/bin
71+
update_host_passwd.sh=../..,0755,/opt/cloud/bin

‎scripts/vm/hypervisor/xenserver/xenserver62/patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin
5454
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
5555
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
5656
swift=..,0755,/opt/cloud/bin
57-
swiftxen=..,0755,/etc/xapi.d/plugins
58-
s3xen=..,0755,/etc/xapi.d/plugins
57+
swiftxenserver=..,0755,/etc/xapi.d/plugins
58+
s3xenserver=..,0755,/etc/xapi.d/plugins
5959
add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin
6060
ovs-pvlan=..,0755,/etc/xapi.d/plugins
6161
ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloud/bin
@@ -64,4 +64,4 @@ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin
6464
ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin
6565
ovs-get-bridge.sh=..,0755,/opt/cloud/bin
6666
cloudlog=..,0644,/etc/logrotate.d
67-
update_host_passwd.sh=../..,0755,/opt/cloud/bin
67+
update_host_passwd.sh=../..,0755,/opt/cloud/bin

‎scripts/vm/hypervisor/xenserver/xenserver65/patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ upgrade_snapshot.sh=..,0755,/opt/cloud/bin
5454
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
5555
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
5656
swift=..,0755,/opt/cloud/bin
57-
swiftxen=..,0755,/etc/xapi.d/plugins
58-
s3xen=..,0755,/etc/xapi.d/plugins
57+
swiftxenserver=..,0755,/etc/xapi.d/plugins
58+
s3xenserver=..,0755,/etc/xapi.d/plugins
5959
add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin
6060
ovs-pvlan=..,0755,/etc/xapi.d/plugins
6161
ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/cloud/bin
@@ -64,4 +64,4 @@ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/cloud/bin
6464
ovs-get-dhcp-iface.sh=..,0755,/opt/cloud/bin
6565
ovs-get-bridge.sh=..,0755,/opt/cloud/bin
6666
cloudlog=..,0644,/etc/logrotate.d
67-
update_host_passwd.sh=../..,0755,/opt/cloud/bin
67+
update_host_passwd.sh=../..,0755,/opt/cloud/bin

0 commit comments

Comments
 (0)