summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Farrellee <matt@redhat.com>2013-07-12 13:21:48 -0400
committerMatthew Farrellee <matt@redhat.com>2013-07-12 13:21:48 -0400
commit1c9c52a977b4c47ffca2b213182ceec20561d338 (patch)
tree5d010e427e9ab0f422ac51fffe22047bc8aac563
parentd79988807f9773a68ca9f16bb739f67b3bba002b (diff)
Allow installing augeas and openssh-client on both Fedora and Ubuntu
Notes
Notes (review): Verified+2: Jenkins Approved+1: Sergey Lukjanov <slukjanov@mirantis.com> Code-Review+2: Sergey Lukjanov <slukjanov@mirantis.com> Code-Review+1: Ivan Berezovskiy <iberezovskiy@mirantis.com> Submitted-by: Jenkins Submitted-at: Tue, 16 Jul 2013 11:23:17 +0000 Reviewed-on: https://review.openstack.org/36863 Project: stackforge/savanna-extra Branch: refs/heads/master
-rwxr-xr-xelements/hadoop_fedora/install.d/40-setup-ssh9
1 files changed, 4 insertions, 5 deletions
diff --git a/elements/hadoop_fedora/install.d/40-setup-ssh b/elements/hadoop_fedora/install.d/40-setup-ssh
index 29cb4a9..0a1a539 100755
--- a/elements/hadoop_fedora/install.d/40-setup-ssh
+++ b/elements/hadoop_fedora/install.d/40-setup-ssh
@@ -3,11 +3,10 @@
3echo "Adjusting ssh configuration" 3echo "Adjusting ssh configuration"
4 4
5# /etc/ssh/sshd_config is provided by openssh-server 5# /etc/ssh/sshd_config is provided by openssh-server
6# /etc/ssh/ssh_config is provided by openssh-clients 6# /etc/ssh/ssh_config is provided by openssh-client
7# Note0: augtool is provided by augeas-tools on Ubuntu 7# Note: You need diskimage-builder w/ SHA 82eacdec (11 July 2013) for
8# Note1: augtool on Ubuntu does not auto-save, pass -s 8# this install to work on Fedora - https://review.openstack.org/#/c/36739/
9# Note2: openssh-clients is openssh-client on Ubuntu 9install-packages augeas-tools openssh-server openssh-client
10install-packages augeas openssh-server openssh-clients
11 10
12 11
13## 12##