backing everything out

diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml
deleted file mode 100644 (file)
index ede85f4..0000000
--- a/hieradata/clusters/ganeti2.debian.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-nodes:
-  - tristano.debian.org
-  - pasquini.debian.org

diff --git a/hieradata/machines/pasquini.debian.org.yaml b/hieradata/machines/pasquini.debian.org.yaml
deleted file mode 100644 (file)
index 4340e0d..0000000
--- a/hieradata/machines/pasquini.debian.org.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-cluster: "ganeti2.debian.org"
-rootkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiT6Asr5mK3wR8hjB1gSqJYqWUrQfi1+jtMuZggQcD7VIpabIy0zYSaUP63Oam96BE96qSHUZDEp1EGPoh64rK/9WxGXX/0sRZXJURkOpCO3U2zDAhRbAGqAAYyWS4TPHVUt3g5g+rrHAGgXzc/y2sYChADWJaQ59ga1MyrYGi1VIPAuAaidM01RyFagR1/UmVGP8jCkSD4nGmho4UuFn9Fopnhk5V0YjEEjhjUkPCVe11ckc+fYPiEPFnzgaWJPAycJwF/YmpgjLSKB+mNXqpU4m+jHhpGQ4lK1l0VVf2xOUpbN74uOxThtwPSpgIyq3eG99PkbBGUUweIcSTsZ8h root@pasquini.debian.org (for ganeti)"

diff --git a/hieradata/machines/tristano.debian.org.yaml b/hieradata/machines/tristano.debian.org.yaml
deleted file mode 100644 (file)
index 8d14d20..0000000
--- a/hieradata/machines/tristano.debian.org.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-cluster: "ganeti2.debian.org"
-rootkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC44glHFs5fdojQOUZaR1xwORfVxpmthmjOBgahz3RTCYzX8g0Y4v3rSBTiFOUzgfaY1qyHJX94HDzIq95Unig5ZHZZ2q0V3m3ksIiMQQbiElIqH4w7Yrqc2PICkjzttGwCziNUCIvxuy9pnKqRkpzx4TmorEVhRBjGTM0iAimWcZ5bpZ1E2nWHVtvsMs5nQziRdAiG8hoE2UKzQbpf+AeltZPSIw2LVEAdTmmEWrmyLGaIWY2R5lirwPOTbZsfpLDUD3CLntZbqCFoTOb1xuWvf0SdmpChY7cigaFgwz+ozATxFuLqdW9/YTa/fP1uvid3rSvHkNgojndm0S3/sYTh root@tristano.debian.org (for ganeti)"

diff --git a/modules/puppetmaster/files/hiera.yaml b/modules/puppetmaster/files/hiera.yaml
index c5013ca..98411f6 100644 (file)
--- a/modules/puppetmaster/files/hiera.yaml
+++ b/modules/puppetmaster/files/hiera.yaml
@@ -1,8 +1,6 @@
 ---
 :hierarchy:
   - %{hoster}
-  - machines/%{fqdn}
-  - clusters/%{cluster}
   - common
 :backends:
   - yaml

diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp
index 4d40154..0824f0f 100644 (file)
--- a/modules/ssh/manifests/init.pp
+++ b/modules/ssh/manifests/init.pp
@@ -1,8 +1,5 @@
 class ssh {
 
-       #nodes = hiera('nodes', nil, {'cluster' => hiera('cluster')})
-       #$rootkeys = nodes.collect{|x| hiera('rootkey', nil, {'hostname' => x})}
-
        package { [ 'openssh-client', 'openssh-server']:
                ensure => installed
        }