Combined services to create chassis-running service

Took the contents of op-reset-pgood-check and
op-reset-set-power-on and combined them to create
the new service op-reset-chassis-running.

Resolves openbmc/openbmc#1337

Change-Id: I6cdb93fcf9f7e701703482ef3dcb8b23ef75cf93
Signed-off-by: Josh D. King <jdking@us.ibm.com>
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
index 7c55e11..f2a7103 100644
--- a/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
+++ b/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
@@ -1,9 +1,10 @@
 [Unit]
 Description=Start chassis%i on after BMC reset
-Requires=op-reset-set-power-on@%i.service
-After=op-reset-set-power-on@%i.service
+Requires=op-reset-chassis-running@%i.service
+After=op-reset-chassis-running@%i.service
 After=obmc-power-reset-on@%i.target
 Requires=obmc-power-reset-on@%i.target
+ConditionPathExists=/run/openbmc/chassis@%i-on
 
 [Service]
 RemainAfterExit=no