Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D47F210A4F for ; Thu, 13 Mar 2014 18:07:13 +0000 (UTC) Received: (qmail 84031 invoked by uid 500); 13 Mar 2014 18:06:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 83476 invoked by uid 500); 13 Mar 2014 18:06:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 82794 invoked by uid 99); 13 Mar 2014 18:05:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2014 18:05:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C3C55944BFB; Thu, 13 Mar 2014 18:05:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Date: Thu, 13 Mar 2014 18:06:22 -0000 Message-Id: <8a29317a34e54ef888868cd66a67a7c4@git.apache.org> In-Reply-To: <6b3a226c4d0c47e399cb8391b2c5754f@git.apache.org> References: <6b3a226c4d0c47e399cb8391b2c5754f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] git commit: updated refs/heads/rbac to 99bdc8d CLOUDSTACK-5779: Clean up leftover VR script in Xen Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e097a0f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e097a0f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e097a0f Branch: refs/heads/rbac Commit: 3e097a0fb289971dc2fc509e0ab5ed78b64cf81b Parents: f45de30 Author: Sheng Yang Authored: Tue Mar 11 13:22:14 2014 -0700 Committer: Sheng Yang Committed: Tue Mar 11 13:22:14 2014 -0700 ---------------------------------------------------------------------- .../vm/hypervisor/xenserver/createipAlias.sh | 25 -------------------- .../vm/hypervisor/xenserver/deleteipAlias.sh | 24 ------------------- scripts/vm/hypervisor/xenserver/vmops | 16 ------------- scripts/vm/hypervisor/xenserver/xcposs/patch | 12 ---------- scripts/vm/hypervisor/xenserver/xcpserver/patch | 9 ------- .../vm/hypervisor/xenserver/xenserver56/patch | 7 ------ .../hypervisor/xenserver/xenserver56fp1/patch | 7 ------ .../vm/hypervisor/xenserver/xenserver60/patch | 7 ------ .../vm/hypervisor/xenserver/xenserver62/patch | 7 ------ 9 files changed, 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/createipAlias.sh ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/createipAlias.sh b/scripts/vm/hypervisor/xenserver/createipAlias.sh deleted file mode 100755 index 4ef6618..0000000 --- a/scripts/vm/hypervisor/xenserver/createipAlias.sh +++ /dev/null @@ -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 \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" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/deleteipAlias.sh ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/deleteipAlias.sh b/scripts/vm/hypervisor/xenserver/deleteipAlias.sh deleted file mode 100644 index 7604172..0000000 --- a/scripts/vm/hypervisor/xenserver/deleteipAlias.sh +++ /dev/null @@ -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 \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" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/vmops ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 2f0f347..4174ef2 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -163,21 +163,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'] try: @@ -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, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/xcposs/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xcposs/patch b/scripts/vm/hypervisor/xenserver/xcposs/patch index 2f902c2..08da883 100644 --- a/scripts/vm/hypervisor/xenserver/xcposs/patch +++ b/scripts/vm/hypervisor/xenserver/xcposs/patch @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/xcpserver/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xcpserver/patch b/scripts/vm/hypervisor/xenserver/xcpserver/patch index 01cd73b..2376424 100644 --- a/scripts/vm/hypervisor/xenserver/xcpserver/patch +++ b/scripts/vm/hypervisor/xenserver/xcpserver/patch @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/xenserver56/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch index 9473bca..16dcb57 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver56/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch index c91aa73..11bda07 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/xenserver60/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch index 5a648e0..662327b 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver60/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch @@ -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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e097a0f/scripts/vm/hypervisor/xenserver/xenserver62/patch ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/xenserver62/patch b/scripts/vm/hypervisor/xenserver/xenserver62/patch index 70b86b4..05c619b 100644 --- a/scripts/vm/hypervisor/xenserver/xenserver62/patch +++ b/scripts/vm/hypervisor/xenserver/xenserver62/patch @@ -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