Enable OCC Active on BMC reset reload

Post BMC reset reload, if the host is up, then we deem
the OCCs are present and hence enable Active state.

Fixes openbmc/openbmc#2126

Change-Id: Ife4af19cda0010f55a1067d1b1c1875632ce81aa
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
diff --git a/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service b/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
index f89d0f0..0179a50 100644
--- a/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
+++ b/common/recipes-phosphor/occ/openpower-occ-control/op-occ-disable@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenPOWER OCC Active Disable
 Before=obmc-host-stop-pre@%i.target
+Conflicts=op-occ-enable@%i.service
 
 [Service]
 ExecStart=/usr/bin/env occ-active.sh disable