mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	CLOUDSTACK-5779: Clean up leftover VR script in Xen
This commit is contained in:
		
							parent
							
								
									f45de30d1b
								
							
						
					
					
						commit
						3e097a0fb2
					
				| @ -1,25 +0,0 @@ | ||||
| #!/usr/bin/env bash | ||||
| # 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. | ||||
| 
 | ||||
| 
 | ||||
| usage() { | ||||
|   printf " %s  routerip  <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2 | ||||
| } | ||||
| 
 | ||||
| cert="/root/.ssh/id_rsa.cloud" | ||||
| ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$1 "/root/createIpAlias.sh $2" | ||||
| @ -1,24 +0,0 @@ | ||||
| #!/usr/bin/env bash | ||||
| # 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. | ||||
| 
 | ||||
| usage() { | ||||
|   printf " %s  routerip  <alias_count:ip:netmask;alias_count2:ip2:netmask2;....> \n" $(basename $0) >&2 | ||||
| } | ||||
| 
 | ||||
| cert="/root/.ssh/id_rsa.cloud" | ||||
| ssh -p 3922 -q -o StrictHostKeyChecking=no -i $cert root@$1 "/root/deleteIpAlias.sh $2 $3" | ||||
| @ -162,21 +162,6 @@ def pingtest(session, args): | ||||
| 
 | ||||
|     return txt | ||||
| 
 | ||||
| @echo | ||||
| def savePassword(session, args): | ||||
|     sargs = args['args'] | ||||
|     cmd = sargs.split(' ') | ||||
|     cmd.insert(0, "/opt/cloud/bin/save_password_to_domr.sh") | ||||
|     cmd.insert(0, "/bin/bash") | ||||
|     try: | ||||
|         txt = util.pread2(cmd) | ||||
|         txt = 'success' | ||||
|     except: | ||||
|         logging.debug("  save password to domr failed "  ) | ||||
|         txt = ''  | ||||
| 
 | ||||
|     return txt | ||||
| 
 | ||||
| @echo | ||||
| def setLinkLocalIP(session, args): | ||||
|     brName = args['brName'] | ||||
| @ -1520,7 +1505,6 @@ if __name__ == "__main__": | ||||
|      XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, "gethostvmstats": gethostvmstats,  | ||||
|                             "getgateway": getgateway, "preparemigration": preparemigration,  | ||||
|                             "setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver,   | ||||
|                             "savePassword": savePassword,  | ||||
|                             "routerProxy": routerProxy,  | ||||
|                             "createFile": createFile, "deleteFile": deleteFile, | ||||
|                             "network_rules":network_rules,  | ||||
|  | ||||
| @ -39,13 +39,6 @@ setupxenserver.sh=..,0755,/opt/cloud/bin | ||||
| make_migratable.sh=..,0755,/opt/cloud/bin | ||||
| setup_iscsi.sh=..,0755,/opt/cloud/bin | ||||
| pingtest.sh=../../..,0755,/opt/cloud/bin | ||||
| dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| ipassoc.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| networkUsage.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| l2tp_vpn.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| cloud-setup-bonding.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| @ -60,12 +53,7 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| upgrade_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| cloud-clean-vlan.sh=..,0755,/opt/cloud/bin | ||||
| cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin | ||||
| getRouterStatus.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| getDomRVersion.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| createipAlias.sh=..,0755,/opt/cloud/bin | ||||
| deleteipAlias.sh=..,0755,/opt/cloud/bin | ||||
| 
 | ||||
| ###add cloudstack plugin script for XCP | ||||
| cloudstack_plugins.conf=..,0644,/etc/xensource | ||||
|  | ||||
| @ -39,13 +39,7 @@ setupxenserver.sh=..,0755,/opt/cloud/bin | ||||
| make_migratable.sh=..,0755,/opt/cloud/bin | ||||
| setup_iscsi.sh=..,0755,/opt/cloud/bin | ||||
| pingtest.sh=../../..,0755,/opt/cloud/bin | ||||
| dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| createipAlias.sh=..,0755,/opt/cloud/bin | ||||
| deleteipAlias.sh=..,0755,/opt/cloud/bin | ||||
| router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| cloud-setup-bonding.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| @ -60,9 +54,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| upgrade_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| cloud-clean-vlan.sh=..,0755,/opt/cloud/bin | ||||
| cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin | ||||
| getRouterStatus.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| getDomRVersion.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin | ||||
| 
 | ||||
| ###add cloudstack plugin script for XCP | ||||
|  | ||||
| @ -39,12 +39,6 @@ make_migratable.sh=..,0755,/opt/cloud/bin | ||||
| setup_iscsi.sh=..,0755,/opt/cloud/bin | ||||
| cloud-setup-bonding.sh=..,0755,/opt/cloud/bin | ||||
| pingtest.sh=../../..,0755,/opt/cloud/bin | ||||
| createipAlias.sh=..,0755,/opt/cloud/bin | ||||
| deleteipAlias.sh=..,0755,/opt/cloud/bin | ||||
| dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| @ -61,7 +55,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| upgrade_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| cloud-clean-vlan.sh=..,0755,/opt/cloud/bin | ||||
| cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin | ||||
| bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| swift=..,0755,/opt/cloud/bin | ||||
| swiftxen=..,0755,/etc/xapi.d/plugins | ||||
| s3xen=..,0755,/etc/xapi.d/plugins | ||||
|  | ||||
| @ -38,12 +38,6 @@ setupxenserver.sh=..,0755,/opt/cloud/bin | ||||
| make_migratable.sh=..,0755,/opt/cloud/bin | ||||
| setup_iscsi.sh=..,0755,/opt/cloud/bin | ||||
| pingtest.sh=../../..,0755,/opt/cloud/bin | ||||
| createipAlias.sh=..,0755,/opt/cloud/bin | ||||
| deleteipAlias.sh=..,0755,/opt/cloud/bin | ||||
| dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| cloud-setup-bonding.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| @ -60,7 +54,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| upgrade_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| cloud-clean-vlan.sh=..,0755,/opt/cloud/bin | ||||
| cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin | ||||
| bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| swift=..,0755,/opt/cloud/bin | ||||
| swiftxen=..,0755,/etc/xapi.d/plugins | ||||
| s3xen=..,0755,/etc/xapi.d/plugins | ||||
|  | ||||
| @ -40,14 +40,8 @@ id_rsa.cloud=../../../systemvm,0600,/root/.ssh | ||||
| network_info.sh=..,0755,/opt/cloud/bin | ||||
| setupxenserver.sh=..,0755,/opt/cloud/bin | ||||
| make_migratable.sh=..,0755,/opt/cloud/bin | ||||
| createipAlias.sh=..,0755,/opt/cloud/bin | ||||
| deleteipAlias.sh=..,0755,/opt/cloud/bin | ||||
| setup_iscsi.sh=..,0755,/opt/cloud/bin | ||||
| pingtest.sh=../../..,0755,/opt/cloud/bin | ||||
| dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| cloud-setup-bonding.sh=..,0755,/opt/cloud/bin | ||||
| copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin | ||||
| @ -64,7 +58,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| upgrade_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| cloud-clean-vlan.sh=..,0755,/opt/cloud/bin | ||||
| cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin | ||||
| bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| swift=..,0755,/opt/cloud/bin | ||||
| swiftxen=..,0755,/etc/xapi.d/plugins | ||||
| s3xen=..,0755,/etc/xapi.d/plugins | ||||
|  | ||||
| @ -40,14 +40,8 @@ id_rsa.cloud=../../../systemvm,0600,/root/.ssh | ||||
| network_info.sh=..,0755,/opt/cloud/bin | ||||
| setupxenserver.sh=..,0755,/opt/cloud/bin | ||||
| make_migratable.sh=..,0755,/opt/cloud/bin | ||||
| createipAlias.sh=..,0755,/opt/cloud/bin | ||||
| deleteipAlias.sh=..,0755,/opt/cloud/bin | ||||
| setup_iscsi.sh=..,0755,/opt/cloud/bin | ||||
| pingtest.sh=../../..,0755,/opt/cloud/bin | ||||
| dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| cloud-setup-bonding.sh=..,0755,/opt/cloud/bin | ||||
| kill_copy_process.sh=..,0755,/opt/cloud/bin | ||||
| @ -60,7 +54,6 @@ vhd-util=..,0755,/opt/cloud/bin | ||||
| upgrade_snapshot.sh=..,0755,/opt/cloud/bin | ||||
| cloud-clean-vlan.sh=..,0755,/opt/cloud/bin | ||||
| cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin | ||||
| bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin | ||||
| swift=..,0755,/opt/cloud/bin | ||||
| swiftxen=..,0755,/etc/xapi.d/plugins | ||||
| s3xen=..,0755,/etc/xapi.d/plugins | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user