Skip to content

Commit 3e097a0

Browse files
author
Sheng Yang
committed
CLOUDSTACK-5779: Clean up leftover VR script in Xen
1 parent f45de30 commit 3e097a0

9 files changed

Lines changed: 0 additions & 114 deletions

File tree

‎scripts/vm/hypervisor/xenserver/createipAlias.sh‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎scripts/vm/hypervisor/xenserver/deleteipAlias.sh‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎scripts/vm/hypervisor/xenserver/vmops‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,6 @@ def pingtest(session, args):
162162

163163
return txt
164164

165-
@echo
166-
def savePassword(session, args):
167-
sargs = args['args']
168-
cmd = sargs.split(' ')
169-
cmd.insert(0, "/opt/cloud/bin/save_password_to_domr.sh")
170-
cmd.insert(0, "/bin/bash")
171-
try:
172-
txt = util.pread2(cmd)
173-
txt = 'success'
174-
except:
175-
logging.debug(" save password to domr failed " )
176-
txt = ''
177-
178-
return txt
179-
180165
@echo
181166
def setLinkLocalIP(session, args):
182167
brName = args['brName']
@@ -1520,7 +1505,6 @@ if __name__ == "__main__":
15201505
XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, "gethostvmstats": gethostvmstats,
15211506
"getgateway": getgateway, "preparemigration": preparemigration,
15221507
"setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver,
1523-
"savePassword": savePassword,
15241508
"routerProxy": routerProxy,
15251509
"createFile": createFile, "deleteFile": deleteFile,
15261510
"network_rules":network_rules,

‎scripts/vm/hypervisor/xenserver/xcposs/patch‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@ setupxenserver.sh=..,0755,/opt/cloud/bin
3939
make_migratable.sh=..,0755,/opt/cloud/bin
4040
setup_iscsi.sh=..,0755,/opt/cloud/bin
4141
pingtest.sh=../../..,0755,/opt/cloud/bin
42-
dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
43-
ipassoc.sh=../../../../network/domr/,0755,/opt/cloud/bin
44-
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
45-
networkUsage.sh=../../../../network/domr/,0755,/opt/cloud/bin
46-
call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
47-
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
48-
l2tp_vpn.sh=../../../../network/domr/,0755,/opt/cloud/bin
4942
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
5043
copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
5144
copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
@@ -60,12 +53,7 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin
6053
upgrade_snapshot.sh=..,0755,/opt/cloud/bin
6154
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
6255
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
63-
getRouterStatus.sh=../../../../network/domr/,0755,/opt/cloud/bin
64-
bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
65-
getDomRVersion.sh=../../../../network/domr/,0755,/opt/cloud/bin
6656
router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
67-
createipAlias.sh=..,0755,/opt/cloud/bin
68-
deleteipAlias.sh=..,0755,/opt/cloud/bin
6957

7058
###add cloudstack plugin script for XCP
7159
cloudstack_plugins.conf=..,0644,/etc/xensource

‎scripts/vm/hypervisor/xenserver/xcpserver/patch‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@ setupxenserver.sh=..,0755,/opt/cloud/bin
3939
make_migratable.sh=..,0755,/opt/cloud/bin
4040
setup_iscsi.sh=..,0755,/opt/cloud/bin
4141
pingtest.sh=../../..,0755,/opt/cloud/bin
42-
dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
43-
createipAlias.sh=..,0755,/opt/cloud/bin
44-
deleteipAlias.sh=..,0755,/opt/cloud/bin
4542
router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
46-
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
47-
call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
48-
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
4943
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
5044
copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
5145
copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
@@ -60,9 +54,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin
6054
upgrade_snapshot.sh=..,0755,/opt/cloud/bin
6155
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
6256
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
63-
getRouterStatus.sh=../../../../network/domr/,0755,/opt/cloud/bin
64-
bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
65-
getDomRVersion.sh=../../../../network/domr/,0755,/opt/cloud/bin
6657
add_to_vcpus_params_live.sh=..,0755,/opt/cloud/bin
6758

6859
###add cloudstack plugin script for XCP

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ make_migratable.sh=..,0755,/opt/cloud/bin
3939
setup_iscsi.sh=..,0755,/opt/cloud/bin
4040
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
4141
pingtest.sh=../../..,0755,/opt/cloud/bin
42-
createipAlias.sh=..,0755,/opt/cloud/bin
43-
deleteipAlias.sh=..,0755,/opt/cloud/bin
44-
dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
45-
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
46-
call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
47-
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
4842
router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
4943
copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
5044
copy_vhd_from_secondarystorage.sh=..,0755,/opt/cloud/bin
@@ -61,7 +55,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin
6155
upgrade_snapshot.sh=..,0755,/opt/cloud/bin
6256
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
6357
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
64-
bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
6558
swift=..,0755,/opt/cloud/bin
6659
swiftxen=..,0755,/etc/xapi.d/plugins
6760
s3xen=..,0755,/etc/xapi.d/plugins

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ setupxenserver.sh=..,0755,/opt/cloud/bin
3838
make_migratable.sh=..,0755,/opt/cloud/bin
3939
setup_iscsi.sh=..,0755,/opt/cloud/bin
4040
pingtest.sh=../../..,0755,/opt/cloud/bin
41-
createipAlias.sh=..,0755,/opt/cloud/bin
42-
deleteipAlias.sh=..,0755,/opt/cloud/bin
43-
dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
44-
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
45-
call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
46-
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
4741
router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
4842
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
4943
copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
@@ -60,7 +54,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin
6054
upgrade_snapshot.sh=..,0755,/opt/cloud/bin
6155
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
6256
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
63-
bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
6457
swift=..,0755,/opt/cloud/bin
6558
swiftxen=..,0755,/etc/xapi.d/plugins
6659
s3xen=..,0755,/etc/xapi.d/plugins

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,8 @@ id_rsa.cloud=../../../systemvm,0600,/root/.ssh
4040
network_info.sh=..,0755,/opt/cloud/bin
4141
setupxenserver.sh=..,0755,/opt/cloud/bin
4242
make_migratable.sh=..,0755,/opt/cloud/bin
43-
createipAlias.sh=..,0755,/opt/cloud/bin
44-
deleteipAlias.sh=..,0755,/opt/cloud/bin
4543
setup_iscsi.sh=..,0755,/opt/cloud/bin
4644
pingtest.sh=../../..,0755,/opt/cloud/bin
47-
dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
48-
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
49-
call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
50-
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
5145
router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
5246
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
5347
copy_vhd_to_secondarystorage.sh=..,0755,/opt/cloud/bin
@@ -64,7 +58,6 @@ create_privatetemplate_from_snapshot.sh=..,0755,/opt/cloud/bin
6458
upgrade_snapshot.sh=..,0755,/opt/cloud/bin
6559
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
6660
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
67-
bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
6861
swift=..,0755,/opt/cloud/bin
6962
swiftxen=..,0755,/etc/xapi.d/plugins
7063
s3xen=..,0755,/etc/xapi.d/plugins

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,8 @@ id_rsa.cloud=../../../systemvm,0600,/root/.ssh
4040
network_info.sh=..,0755,/opt/cloud/bin
4141
setupxenserver.sh=..,0755,/opt/cloud/bin
4242
make_migratable.sh=..,0755,/opt/cloud/bin
43-
createipAlias.sh=..,0755,/opt/cloud/bin
44-
deleteipAlias.sh=..,0755,/opt/cloud/bin
4543
setup_iscsi.sh=..,0755,/opt/cloud/bin
4644
pingtest.sh=../../..,0755,/opt/cloud/bin
47-
dhcp_entry.sh=../../../../network/domr/,0755,/opt/cloud/bin
48-
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/cloud/bin
49-
call_firewall.sh=../../../../network/domr/,0755,/opt/cloud/bin
50-
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/cloud/bin
5145
router_proxy.sh=../../../../network/domr/,0755,/opt/cloud/bin
5246
cloud-setup-bonding.sh=..,0755,/opt/cloud/bin
5347
kill_copy_process.sh=..,0755,/opt/cloud/bin
@@ -60,7 +54,6 @@ vhd-util=..,0755,/opt/cloud/bin
6054
upgrade_snapshot.sh=..,0755,/opt/cloud/bin
6155
cloud-clean-vlan.sh=..,0755,/opt/cloud/bin
6256
cloud-prepare-upgrade.sh=..,0755,/opt/cloud/bin
63-
bumpUpPriority.sh=../../../../network/domr/,0755,/opt/cloud/bin
6457
swift=..,0755,/opt/cloud/bin
6558
swiftxen=..,0755,/etc/xapi.d/plugins
6659
s3xen=..,0755,/etc/xapi.d/plugins

0 commit comments

Comments
 (0)