diff --git a/sysinv/sysinv/sysinv/scripts/sysinv-api b/sysinv/sysinv/sysinv/scripts/sysinv-api index 9b0bb302aa..5eb22eeb47 100755 --- a/sysinv/sysinv/sysinv/scripts/sysinv-api +++ b/sysinv/sysinv/sysinv/scripts/sysinv-api @@ -56,7 +56,6 @@ OCF_RESKEY_client_binary_default="system" : ${OCF_RESKEY_client_binary=${OCF_RESKEY_client_binary_default}} mydaemon="/usr/bin/${OCF_RESKEY_binary}" -TMP_DIR=/var/run/sysinv ####################################################################### @@ -137,22 +136,6 @@ END return ${OCF_SUCCESS} } -sysinv_api_tmpdir () { - local rc - - if [ ! -d "$TMP_DIR" ]; then - mkdir -p "$TMP_DIR" - rc=$? - if [ $rc -ne 0 ]; then - ocf_log err "Inventory Service (${OCF_RESKEY_binary}) failed to create temp dir (rc=${rc})" - return ${OCF_NOT_RUNNING} - fi - chown sysinv:sysinv "$TMP_DIR" - fi - export TMPDIR="$TMP_DIR" - return ${OCF_SUCCESS} -} - sysinv_api_validate() { local rc @@ -409,10 +392,6 @@ esac # Anything except meta-data and help must pass validation sysinv_api_validate || exit $? -# Set up tmpfiles directory to avoid temp files being -# cleaned up by systemd tmpfiles clean service. -sysinv_api_tmpdir || exit $? - if [ ${OCF_RESKEY_dbg} = "true" ] ; then ocf_log info "${binname}:${__OCF_ACTION} action" fi diff --git a/sysinv/sysinv/sysinv/scripts/sysinv-conductor b/sysinv/sysinv/sysinv/scripts/sysinv-conductor index 5f16f50a03..7443e3ef58 100755 --- a/sysinv/sysinv/sysinv/scripts/sysinv-conductor +++ b/sysinv/sysinv/sysinv/scripts/sysinv-conductor @@ -40,7 +40,6 @@ OCF_RESKEY_config_default="/etc/sysinv/sysinv.conf" : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} mydaemon="/usr/bin/${OCF_RESKEY_binary}" -TMP_DIR="/var/run/sysinv_tmp" ####################################################################### @@ -112,21 +111,6 @@ END return ${OCF_SUCCESS} } -sysinv_conductor_tmpdir () { - local rc - if [ ! -d "$TMP_DIR" ]; then - mkdir -p "$TMP_DIR" - rc=$? - if [ $rc -ne 0 ]; then - ocf_log err "Inventory Service (${OCF_RESKEY_binary}) failed to create temp dir (rc=${rc})" - return ${OCF_NOT_RUNNING} - fi - chown sysinv:sysinv "$TMP_DIR" - fi - export TMPDIR="$TMP_DIR" - return ${OCF_SUCCESS} -} - sysinv_conductor_validate() { local rc @@ -405,15 +389,10 @@ esac # Anything except meta-data and help must pass validation sysinv_conductor_validate || exit $? -# Set up tmpfiles directory to avoid temp files being -# cleaned up by systemd tmpfiles clean service. -sysinv_conductor_tmpdir || exit $? - if [ ${OCF_RESKEY_dbg} = "true" ] ; then ocf_log info "${binname}:${__OCF_ACTION} action" fi - case ${__OCF_ACTION} in start) sysinv_conductor_start