From 954e6c0357f57822f39a37840dfc5e5b4cf794df Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Fri, 2 Mar 2012 10:30:11 -0800
Subject: [PATCH] Remove reference to ssh keys
Swift does not need to have keys. This commit
removes the ssh keys.
---
QUESTIONS | 1 +
manifests/init.pp | 32 --------------------------------
2 files changed, 1 insertion(+), 32 deletions(-)
create mode 100644 QUESTIONS
diff --git a/QUESTIONS b/QUESTIONS
new file mode 100644
index 00000000..b55d10ab
--- /dev/null
+++ b/QUESTIONS
@@ -0,0 +1 @@
+do we need ssh keys for anything?
diff --git a/manifests/init.pp b/manifests/init.pp
index be112be7..d5c1b9b8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,9 +7,6 @@
# [*package_ensure*] The ensure state for the swift package.
# Optional. Defaults to present.
#
-# [*swift_ssh_key*] NOT YET IMPLEMENTED. I am not entirely sure what
-# this key is intended to be used for.
-#
# == Dependencies
#
# Class['ssh::server::install']
@@ -24,11 +21,9 @@
#
class swift(
$swift_hash_suffix,
-# $swift_ssh_key,
$package_ensure = 'present'
) {
- # maybe I should just install ssh?
Class['ssh::server::install'] -> Class['swift']
package { 'swift':
@@ -56,31 +51,4 @@ class swift(
mode => 0660,
content => template('swift/swift.conf.erb'),
}
-
-# if ($swift_ssh_key) {
-# if $swift_ssh_key !~ /^(ssh-...) +([^ ]*) *([^ \n]*)/ {
-# err("Can't parse swift_ssh_key")
-# notify { "Can't parse public key file $name on the keymaster: skipping ensure => $e
-#nsure": }
-# } else {
-# $keytype = $1
-# $modulus = $2
-# $comment = $3
-# ssh_authorized_key { $comment:
-# ensure => "present",
-# user => "swift",
-# type => $keytype,
-# key => $modulus,
-# options => $options ? { "" => undef, default => $options },
-# require => File["/home/swift"]
-# }
-# }
-# }
-# does swift need an ssh key?
-# they are adding one in the openstack modules
-
-#
-# I do not understand how to configure the rings
-# or why rings would be configured on the proxy?
-
}