From 066dfcd8f7893c5287ca0f82e211d2cf1907ad80 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Mon, 18 Mar 2019 13:58:26 -0500
Subject: [PATCH] Remove nova-api requirement from sysinv OCF scripts

SysInv API and Conductor had a check in their OCF
script that required nova-api binary was present
in order for them to launch.

This commit eliminates that check, and therefore allows the
nova-api components to be removable from bare metal controller.

Story: 2004764
Task: 30064
Change-Id: I372f9e7e6fcb30ad81289c9bd6b33a6ad48670a9
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
---
 sysinv/sysinv/centos/build_srpm.data          | 2 +-
 sysinv/sysinv/sysinv/scripts/sysinv-api       | 1 -
 sysinv/sysinv/sysinv/scripts/sysinv-conductor | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data
index 5ee6864cda..ef60b39a4e 100644
--- a/sysinv/sysinv/centos/build_srpm.data
+++ b/sysinv/sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=308
+TIS_PATCH_VER=309
diff --git a/sysinv/sysinv/sysinv/scripts/sysinv-api b/sysinv/sysinv/sysinv/scripts/sysinv-api
index 2453f2bf77..51364d9fd1 100755
--- a/sysinv/sysinv/sysinv/scripts/sysinv-api
+++ b/sysinv/sysinv/sysinv/scripts/sysinv-api
@@ -147,7 +147,6 @@ sysinv_api_validate() {
 
     check_binary ${OCF_RESKEY_binary}
     check_binary sysinv-conductor
-    check_binary nova-api
     check_binary pidof
 
     if [ ! -f ${OCF_RESKEY_config} ] ; then
diff --git a/sysinv/sysinv/sysinv/scripts/sysinv-conductor b/sysinv/sysinv/sysinv/scripts/sysinv-conductor
index acd3f3028a..92726b5a0d 100755
--- a/sysinv/sysinv/sysinv/scripts/sysinv-conductor
+++ b/sysinv/sysinv/sysinv/scripts/sysinv-conductor
@@ -122,7 +122,6 @@ sysinv_conductor_validate() {
 
     check_binary ${OCF_RESKEY_binary}
     check_binary sysinv-api
-    check_binary nova-api
     check_binary pidof
 
     if [ ! -f ${OCF_RESKEY_config} ] ; then