introduce new key naming

build/init.sls

@@ -95,7 +95,7 @@ firmware-git:
 
 /srv/build/opkg-keys/gluon-opkg-key:
   file.managed:
-    - contents_pillar: nodes:{{ grains['id'] }}:opkg:build:opkg_privkey
+    - contents_pillar: nodes:{{ grains['id'] }}:opkg:build:privkey
     - user: build
     - group: build
     - mode: 400
@@ -140,7 +140,7 @@ firmware.in.ffho.net:
 
 /home/build/.ssh/id_rsa:
   file.managed:
-    - contents_pillar: nodes:{{ grains['id'] }}:ssh:build:ssh_privkey
+    - contents_pillar: nodes:{{ grains['id'] }}:ssh:build:privkey
     - user: build
     - group: build
     - mode: 400

firmware/init.sls

@@ -63,7 +63,7 @@ git.c3pb.de:
 
 /home/firmware/.ssh/authorized_keys:
   file.managed:
-    - contents_pillar: nodes:masterbuilder.in.ffho.net:ssh:build:ssh_pubkey
+    - contents_pillar: nodes:masterbuilder.in.ffho.net:ssh:build:pubkey
     - user: firmware
     - group: firmware
     - mode: 644
@@ -72,7 +72,7 @@ git.c3pb.de:
 
 /home/firmware/.ssh/id_rsa:
   file.managed:
-    - contents_pillar: nodes:{{ grains['id'] }}:ssh:firmware:ssh_privkey
+    - contents_pillar: nodes:{{ grains['id'] }}:ssh:firmware:privkey
     - user: firmware
     - group: firmware
     - mode: 400