From 1787754d572acd9b477c5bc09ea44e0236265487 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 15 Aug 2016 15:19:04 +0300
Subject: [PATCH] Change DIB_IPA_CERT resulting file name

Even though this file ends up in the /tmp directory, for readability
it's good to point out that server.pem is not necessarily the
certificate for a server, but can be a CA certificate which is
trusted if this option is used.

Change-Id: Iea27a702a844456e4472957438f75ed3819d62ca
---
 elements/ironic-agent/extra-data.d/15-ssl-ca-copy             | 2 +-
 .../ironic-agent-source-install/60-ironic-agent-install       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/elements/ironic-agent/extra-data.d/15-ssl-ca-copy b/elements/ironic-agent/extra-data.d/15-ssl-ca-copy
index 1a3c1ad6..f04917ba 100755
--- a/elements/ironic-agent/extra-data.d/15-ssl-ca-copy
+++ b/elements/ironic-agent/extra-data.d/15-ssl-ca-copy
@@ -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
diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
index 3c93d70f..1169f176 100755
--- a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
+++ b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
@@ -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