Optional argument to import a non-default key (useful for backup restoration) at...

diff --git a/TODO.md b/TODO.md
index 409f5246a7aa889fe451b5a1e3ef39c64a037677..0f16ed9c710f9632e485f72cdcd4886061a5e014 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -6,7 +6,6 @@ Hydra
 
   - bootless: properly support `$subdevice` in parted or always use first device (like `/dev/sdb1`).
   - puppet-setup-stored: configure storeconfigs database.
-  - import-key: optional argument to import a non-default key (useful for backup restoration).
 
 Hydractl
 --------

diff --git a/share/hydra/import-key b/share/hydra/import-key
index 5658728f31120a0153ddda4e0ba2fce5e27e614a..ffffb064860c1b57a446fbcfba1bba05fa528b9d 100755 (executable)
--- a/share/hydra/import-key
+++ b/share/hydra/import-key
@@ -35,7 +35,12 @@ fi
 
 # Deploy
 for node in $NODES; do
-  hostname="`echo $node | cut -d . -f 1`"
+  if [ ! -z "$HOST" ]; then
+    hostname="$HOST"
+  else
+    hostname="`echo $node | cut -d . -f 1`"
+  fi
+
   key="$(keyringer $HYDRA decrypt $hostname/gpg/key 2> /dev/null | sed -ne '1,$p')"
   key_id="$(echo "$key" | gpg --with-colons | grep sec | cut -d : -f 5)"