From dd2cdaa3faa8642c0ed2a09ed7ef823ea2740438 Mon Sep 17 00:00:00 2001 From: Luca Filipozzi Date: Wed, 16 May 2012 08:03:24 +0000 Subject: [PATCH] move ganeti details into hiera --- hieradata/clusters/ganeti2.debian.org.yaml | 4 ++++ hieradata/machines/pasquini.debian.org.yaml | 3 +++ hieradata/machines/tristano.debian.org.yaml | 2 ++ modules/ssh/templates/authorized_keys.erb | 4 ++++ 4 files changed, 13 insertions(+) create mode 100644 hieradata/clusters/ganeti2.debian.org.yaml create mode 100644 hieradata/machines/pasquini.debian.org.yaml create mode 100644 hieradata/machines/tristano.debian.org.yaml diff --git a/hieradata/clusters/ganeti2.debian.org.yaml b/hieradata/clusters/ganeti2.debian.org.yaml new file mode 100644 index 000000000..ede85f480 --- /dev/null +++ b/hieradata/clusters/ganeti2.debian.org.yaml @@ -0,0 +1,4 @@ +--- +nodes: + - tristano.debian.org + - pasquini.debian.org diff --git a/hieradata/machines/pasquini.debian.org.yaml b/hieradata/machines/pasquini.debian.org.yaml new file mode 100644 index 000000000..972205b82 --- /dev/null +++ b/hieradata/machines/pasquini.debian.org.yaml @@ -0,0 +1,3 @@ +--- +rootkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiT6Asr5mK3wR8hjB1gSqJYqWUrQfi1+jtMuZggQcD7VIpabIy0zYSaUP63Oam96BE96qSHUZDEp1EGPoh64rK/9WxGXX/0sRZXJURkOpCO3U2zDAhRbAGqAAYyWS4TPHVUt3g5g+rrHAGgXzc/y2sYChADWJaQ59ga1MyrYGi1VIPAuAaidM01RyFagR1/UmVGP8jCkSD4nGmho4UuFn9Fopnhk5V0YjEEjhjUkPCVe11ckc+fYPiEPFnzgaWJPAycJwF/YmpgjLSKB+mNXqpU4m+jHhpGQ4lK1l0VVf2xOUpbN74uOxThtwPSpgIyq3eG99PkbBGUUweIcSTsZ8h root@pasquini.debian.org (for ganeti)" +"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC44glHFs5fdojQOUZaR1xwORfVxpmthmjOBgahz3RTCYzX8g0Y4v3rSBTiFOUzgfaY1qyHJX94HDzIq95Unig5ZHZZ2q0V3m3ksIiMQQbiElIqH4w7Yrqc2PICkjzttGwCziNUCIvxuy9pnKqRkpzx4TmorEVhRBjGTM0iAimWcZ5bpZ1E2nWHVtvsMs5nQziRdAiG8hoE2UKzQbpf+AeltZPSIw2LVEAdTmmEWrmyLGaIWY2R5lirwPOTbZsfpLDUD3CLntZbqCFoTOb1xuWvf0SdmpChY7cigaFgwz+ozATxFuLqdW9/YTa/fP1uvid3rSvHkNgojndm0S3/sYTh root@tristano.debian.org (for ganeti)" diff --git a/hieradata/machines/tristano.debian.org.yaml b/hieradata/machines/tristano.debian.org.yaml new file mode 100644 index 000000000..46c0dd992 --- /dev/null +++ b/hieradata/machines/tristano.debian.org.yaml @@ -0,0 +1,2 @@ +--- +rootkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC44glHFs5fdojQOUZaR1xwORfVxpmthmjOBgahz3RTCYzX8g0Y4v3rSBTiFOUzgfaY1qyHJX94HDzIq95Unig5ZHZZ2q0V3m3ksIiMQQbiElIqH4w7Yrqc2PICkjzttGwCziNUCIvxuy9pnKqRkpzx4TmorEVhRBjGTM0iAimWcZ5bpZ1E2nWHVtvsMs5nQziRdAiG8hoE2UKzQbpf+AeltZPSIw2LVEAdTmmEWrmyLGaIWY2R5lirwPOTbZsfpLDUD3CLntZbqCFoTOb1xuWvf0SdmpChY7cigaFgwz+ozATxFuLqdW9/YTa/fP1uvid3rSvHkNgojndm0S3/sYTh root@tristano.debian.org (for ganeti)" diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index 23ee49b72..ce054cdb2 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -24,6 +24,10 @@ localkeys end ganetikeys %> +<%= + nodes = hiera('nodes', nil, {'cluster' => hiera('cluster')}) + nodes.collect{|x| hiera('rootkey', nil, {'hostname' => x})} +%> # # DSA # -- 2.20.1