Load openssl conf from the right localtion (#985)

canonical · Feb 28, 2020 · 830eb36 · 830eb36
1 parent 050e98b
commit 830eb36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/microk8s-resources/wrappers/microk8s-add-node.wrapper b/microk8s-resources/wrappers/microk8s-add-node.wrapper
@@ -5,6 +5,7 @@ set -eu
 export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
 ARCH="$($SNAP/bin/uname -m)"
 export LD_LIBRARY_PATH="$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/$ARCH-linux-gnu:$SNAP/usr/lib/$ARCH-linux-gnu"
+export OPENSSL_CONF="/snap/microk8s/current/etc/ssl/openssl.cnf"
 
 source $SNAP/actions/common/utils.sh
 

diff --git a/microk8s-resources/wrappers/run-cluster-agent-with-args b/microk8s-resources/wrappers/run-cluster-agent-with-args
@@ -6,6 +6,7 @@ export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
 ARCH="$($SNAP/bin/uname -m)"
 export LD_LIBRARY_PATH="$SNAP/lib:$SNAP/usr/lib:$SNAP/lib/$ARCH-linux-gnu:$SNAP/usr/lib/$ARCH-linux-gnu"
 export LD_LIBRARY_PATH=$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH
+export OPENSSL_CONF="/snap/microk8s/current/etc/ssl/openssl.cnf"
 
 # This is really the only way I could find to get the args passed in correctly. WTF
 declare -a args="($(cat $SNAP_DATA/args/cluster-agent))"