From 9b89dfd6438b8a669617c64c82198c92443a29d8 Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Fri, 11 Dec 2015 11:37:42 +0100
Subject: [PATCH] CLOUDSTACK-9139 make zwps default when defined on zone level

---
 tools/marvin/marvin/deployDataCenter.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 3dd56672dde..91b30a65877 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -243,8 +243,8 @@ class DeployDataCenters(object):
 
                 primarycmd.tags = primary.tags
                 primarycmd.url = primary.url
-                if primary.scope == 'zone':
-                    primarycmd.scope = primary.scope
+                if primary.scope == 'zone' or clusterId is None:
+                    primarycmd.scope = 'zone'
                     primarycmd.hypervisor = primary.hypervisor
                 else:
                     primarycmd.podid = podId