From 6c6fc65cd6cc07a346f3e75edd080b941c52d3a8 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Mon, 23 Sep 2019 13:48:31 +0200
Subject: [PATCH] DIB: do not use /tmp for a virtualenv in the source build

We don't (and shouldn't) copy /tmp to the final image.

Also fix the service file permissions - it is not executable.

Change-Id: I75e09662a63768627f8123a7fe7f5d9ca2d942c5
---
 .../60-ironic-python-agent-ramdisk-install          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
index e1496da..c1d8949 100755
--- a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
+++ b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
@@ -8,30 +8,31 @@ set -o pipefail
 
 SCRIPTDIR=$(dirname $0)
 IPADIR=/tmp/ironic-python-agent
+VENVDIR=/opt/ironic-python-agent
 
 # Generate upper-constraints
 $IPADIR/imagebuild/common/generate_upper_constraints.sh $IPADIR/upper-constraints.txt
 
 # create the virtual environment
-virtualenv $IPADIR/venv
+virtualenv $VENVDIR
 
 # pip might be an older version which does not support the -c option, therefore upgrade first
-$IPADIR/venv/bin/pip install pip --upgrade
+$VENVDIR/bin/pip install pip --upgrade
 
 # install IPA inside the virtual environment
-$IPADIR/venv/bin/pip install -c $IPADIR/upper-constraints.txt $IPADIR
+$VENVDIR/bin/pip install -c $IPADIR/upper-constraints.txt $IPADIR
 
 # FIXME(lucasagomes): Figure out how we can use the "--install-option"
 # parameter for pip install so we don't have to manually create a symlink
 # create the launcher link so services can use it
-ln -s $IPADIR/venv/bin/ironic-python-agent /usr/local/bin/ironic-python-agent
+ln -s $VENVDIR/bin/ironic-python-agent /usr/local/bin/ironic-python-agent
 
 case "$DIB_INIT_SYSTEM" in
     upstart)
         install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.conf /etc/init/ironic-python-agent.conf
         ;;
     systemd)
-        install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.service /usr/lib/systemd/system/ironic-python-agent.service
+        install -D -g root -o root -m 0644 ${SCRIPTDIR}/ironic-python-agent.service /usr/lib/systemd/system/ironic-python-agent.service
         ;;
     sysv)
         install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.init /etc/init.d/ironic-python-agent.init
@@ -45,5 +46,5 @@ esac
 
 # Copying the self signed certificate for request library
 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()")
+    cat /tmp/in_target.d/ipa-trusted-cert.pem >> $($VENVDIR/bin/python -c "import requests; print requests.certs.where()")
 fi