sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Change DIB_IPA_CERT resulting file name"

Browse source
This commit is contained in:
Jenkins 2016-08-18 13:35:12 +00:00 committed by Gerrit Code Review
commit c20a42051a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elements/ironic-agent/extra-data.d/15-ssl-ca-copy
View file

@ -8,5 +8,5 @@ set -eu
set -o pipefail
if [ -n "${DIB_IPA_CERT:=}" ]; then
cp $DIB_IPA_CERT $TMP_HOOKS_PATH/server.pem
cp $DIB_IPA_CERT $TMP_HOOKS_PATH/ipa-trusted-cert.pem
fi

4
elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
View file

@ -38,6 +38,6 @@ case "$DIB_INIT_SYSTEM" in
esac
# Copying the self signed certificate for request library
if [ -f /tmp/in_target.d/server.pem ]; then
cat /tmp/in_target.d/server.pem >> $($IPADIR/venv/bin/python -c "import requests; print requests.certs.where()")
if [ -f /tmp/in_target.d/ipa-trusted-cert.pem ]; then
cat /tmp/in_target.d/ipa-trusted-cert.pem >> $($IPADIR/venv/bin/python -c "import requests; print requests.certs.where()")
fi