diff --git a/docker/haproxy/haproxy-ssh/update-haproxy-cert.sh b/docker/haproxy/haproxy-ssh/update-haproxy-cert.sh index fe7d8e9fa9..7e4122c65f 100755 --- a/docker/haproxy/haproxy-ssh/update-haproxy-cert.sh +++ b/docker/haproxy/haproxy-ssh/update-haproxy-cert.sh @@ -34,7 +34,7 @@ function haproxy_transaction_start { cert_input_sha1=$(openssl x509 -noout -fingerprint -sha1 -inform pem -in ${cert_input} | awk -F '=' '{print $2}' | sed -e 's/://g') cert_dest_sha1=$(echo "show ssl cert *${cert_dest}" | socat unix-connect:/var/lib/kolla/haproxy/haproxy.sock - | awk -F 'SHA1 FingerPrint: ' '{print $2}' | sed '/^$/d') if [ "${cert_input_sha1}" = "${cert_dest_sha1}" ]; then - log_info "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} successfull." + log_info "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} successful." else log_error "[${cert_dest} - update] Transaction ${cert_input} -> ${cert_dest} failed, SHA1 fingerprint of ${cert_input} is not the same as uploaded one." exit 1 diff --git a/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh b/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh index 29fd42dc08..055e5879ab 100755 --- a/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh +++ b/docker/letsencrypt/letsencrypt-lego/letsencrypt-certificates.sh @@ -171,7 +171,7 @@ if [ "${INTERNAL_SET}" = "true" ] || [ "${EXTERNAL_SET}" = "true" ]; then fi - if ip a | egrep -q "${LETSENCRYPT_VIP_ADDRESSES}"; then + if /usr/sbin/ip a | egrep -q "${LETSENCRYPT_VIP_ADDRESSES}"; then log_info "[${FQDN} - cron] This Letsencrypt-lego host is active..." if [ "${LETSENCRYPT_INTERNAL_FQDNS}" != "" ]; then log_info "[${FQDN} - cron] Processing domains ${LETSENCRYPT_INTERNAL_FQDNS}" diff --git a/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh b/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh index 7cc12de710..e3b61797e8 100644 --- a/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh +++ b/docker/letsencrypt/letsencrypt-lego/sync-and-update-certificate.sh @@ -65,12 +65,12 @@ if [ "${INTERNAL_SET}" = "true" ] || [ "${EXTERNAL_SET}" = "true" ]; then server=$(echo $i | awk -F ':' '{print $1}') port=$(echo $i | awk -F ':' '{print $2}') - if ! ip a | grep -q "${server}"; then + if ! /usr/sbin/ip a | grep -q "${server}"; then log_info "[${FQDN} - hook] Rsync lego data /etc/letsencrypt/lego/ to server ${server} and port ${port}" rsync -a -e "ssh -p ${port} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentityFile=/var/lib/letsencrypt/.ssh/id_rsa" /etc/letsencrypt/lego/ haproxy@${server}:/etc/letsencrypt/lego/ --delete >/dev/null 2>&1 if [ "$?" -eq 0 ]; then - log_info "[${FQDN} - hook] Rsync Successfull." + log_info "[${FQDN} - hook] Rsync Successful." fi else diff --git a/releasenotes/notes/fix-letsencrypt-ip-command-not-found-3c455acaf743409e.yaml b/releasenotes/notes/fix-letsencrypt-ip-command-not-found-3c455acaf743409e.yaml new file mode 100644 index 0000000000..4edccfcf18 --- /dev/null +++ b/releasenotes/notes/fix-letsencrypt-ip-command-not-found-3c455acaf743409e.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes the issue with command not found within letsencrypt-lego container. + `LP#2051111 `__