From a20b67dd039de4407a754d248de9fd8c15a893d7 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 17 Nov 2015 16:45:16 +0000
Subject: [PATCH] Adjust upgrade playbook for packages.

---
 playbooks/manual/upgrade/packages.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/playbooks/manual/upgrade/packages.yml b/playbooks/manual/upgrade/packages.yml
index 5e9f911463..77bda883db 100644
--- a/playbooks/manual/upgrade/packages.yml
+++ b/playbooks/manual/upgrade/packages.yml
@@ -38,14 +38,19 @@
     ignore_errors: true
 
   roles:
-  - packages/web
+  - role: packages/web
+    when: env != "staging"
+  - role: packages3/web
+    when: env == "staging"
 
   post_tasks:
   - service: name="fcomm-cache-worker" state=stopped
+    when: env != "staging"
   - service: name="httpd" state=stopped
   # TODO -- do any DB maintenance steps we need to do here..
   - service: name="httpd" state=started
   - service: name="fcomm-cache-worker" state=started
+    when: env != "staging"
 
   - name: tell nagios to unshush
     nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }}