From 263b8eec142c450772864b623fd7f05ba5aa96ca Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Fri, 16 Nov 2012 10:17:12 -0700 Subject: [PATCH] Summary: Adding utility to make system vm maintenance easier for admins Detail: new script called cloud-ssh replaces the long 'ssh -i /root/.ssh/id_rsa.cloud -p 3922 root@169.254.0.12' users can now just run 'cloud-ssh 169.254.0.12'. Also adds it to deb and rpm builds. Signed-off-by: Marcus Sorensen 1353086232 -0700 --- agent/bindir/cloud-ssh.in | 19 +++++++++++++++++++ cloud.spec | 1 + debian/cloud-agent.install | 1 + 3 files changed, 21 insertions(+) create mode 100644 agent/bindir/cloud-ssh.in diff --git a/agent/bindir/cloud-ssh.in b/agent/bindir/cloud-ssh.in new file mode 100644 index 00000000000..e4b3c141a97 --- /dev/null +++ b/agent/bindir/cloud-ssh.in @@ -0,0 +1,19 @@ +#!/bin/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. + +ssh -i /root/.ssh/id_rsa.cloud -p 3922 root@$1 diff --git a/cloud.spec b/cloud.spec index 29c10936a9f..127dfa4e048 100644 --- a/cloud.spec +++ b/cloud.spec @@ -575,6 +575,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/agent/log4j-%{name}.xml %attr(0755,root,root) %{_initrddir}/%{name}-agent %attr(0755,root,root) %{_bindir}/%{name}-setup-agent +%attr(0755,root,root) %{_bindir}/%{name}-ssh %dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/agent %doc LICENSE %doc NOTICE diff --git a/debian/cloud-agent.install b/debian/cloud-agent.install index 1afb7fa9f94..c67e90ab492 100644 --- a/debian/cloud-agent.install +++ b/debian/cloud-agent.install @@ -21,4 +21,5 @@ /etc/cloud/agent/log4j-cloud.xml /etc/init.d/cloud-agent /usr/bin/cloud-setup-agent +/usr/bin/cloud-ssh /var/log/cloud/agent