mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	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
This commit is contained in:
		
							parent
							
								
									f241455a63
								
							
						
					
					
						commit
						5fed4f41d7
					
				@ -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
 | 
			
		||||
 | 
			
		||||
@ -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'
 | 
			
		||||
 | 
			
		||||
@ -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):
 | 
			
		||||
@ -55,8 +55,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
 | 
			
		||||
 | 
			
		||||
###add cloudstack plugin script for XCP
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
###add cloudstack plugin script for XCP
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user