Move VCS workarounds into new obmc-power-chassis targets

Change-Id: I12e71adf8d2635360087a0781354391121af3d7b
Signed-off-by: Andrew Geissler <andrewg@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service
index c218d05..cf2fdce 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/ucd_disable_vcs@.service
@@ -2,7 +2,7 @@
 Description=Disable UCD VCS rails
 Wants=obmc-power-start-pre@%i.target
 Before=obmc-power-start-pre@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/ucd_disable_vcs.sh
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service
index 99b4508..f929afb 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off@.service
@@ -2,7 +2,7 @@
 Description=Disable VCS before Witherspoon power on
 Wants=obmc-power-start-pre@%i.target
 Before=obmc-power-start-pre@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/vcs_off.sh
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service
index d8d4b2c..e039479 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_off_poweroff@.service
@@ -2,7 +2,7 @@
 Description=Disable VCS on a power off
 Wants=op-wait-power-off@%i.service
 After=op-wait-power-off@%i.service
-Conflicts=obmc-chassis-start@%i.target
+Conflicts=obmc-power-chassis-on@%i.target
 
 [Service]
 ExecStart={bindir}/vcs_off.sh
@@ -10,4 +10,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-stop@%i.target
+WantedBy=obmc-power-chassis-off@%i.target
diff --git a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service
index c86bd43..df74920 100644
--- a/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service
+++ b/meta-witherspoon/recipes-phosphor/chassis/vcs-pre-post/vcs_on@.service
@@ -4,7 +4,7 @@
 After=vcs_workaround@%i.service
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-chassis-stop@%i.target
+Conflicts=obmc-power-chassis-off@%i.target
 
 [Service]
 ExecStart={bindir}/vcs_on.sh
@@ -12,4 +12,4 @@
 RemainAfterExit=yes
 
 [Install]
-WantedBy=obmc-chassis-start@%i.target
+WantedBy=obmc-power-chassis-on@%i.target