Ensure eyaml key availability

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index ed41d08eaa1f78bc84beab78961ce7b2bf344237..2cff22b2636e4117cbc3b1ec3699fb5922e6b4a8 100644 (file)
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -58,6 +58,13 @@ function hydra_deploy_setup {
     FQDN="`cat /etc/hostname`"
     PUPPET_OPTS="--confdir=$HYDRA_FOLDER/puppet --modulepath=$HYDRA_FOLDER/puppet/modules"
     hydra_deploy_set_manifest $HYDRA_FOLDER
+
+    # Fix eyaml keys
+    mkdir -p $HYDRA_FOLDER/puppet/keys
+    rm -f $HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem
+    rm -f $HYDRA_FOLDER/puppet/keys/public_key.pkcs7.pem
+    ln -sf $HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/private_key.pkcs7.pem $HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem
+    ln -sf $HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/public_key.pkcs7.pem $HYDRA_FOLDER/puppet/keys/public_key.pkcs7.pem
   fi
 
   # Common parameters
@@ -118,7 +125,8 @@ function hydra_deploy_copy_keys {
     location="remote"
   fi
 
-  $DEPLOY_COMMAND mkdir -p $FOLDER/etc/puppet/keys
+  # Ensure key availability
+  hydra $HYDRA eyaml $FQDN
 
   if [ -e "$HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/private_key.pkcs7.pem" ]; then
     hydra_deploy_copy $location $HYDRA_FOLDER/puppet/keys/$FQDN/eyaml/private_key.pkcs7.pem $DEPLOY_DEST/etc/puppet/keys/private_key.pkcs7.pem

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 1307802b3fbbf65d3463dfdd7c75de887ada2741..f8dbb084f0d2f4b104f6f4b8cb2098fa137a2b7d 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -80,6 +80,9 @@ for node in $NODES; do
     # Setup deploy environment
     hydra_deploy_setup
 
+    # Ensure key availability
+    hydra $HYDRA eyaml $FQDN
+
     # Check if puppet is installed
     if [ ! -e "/usr/bin/puppet" ]; then
       $SUDO apt-get update