Repository: cloudstack Updated Branches: refs/heads/pytest 8b7f88ac9 -> 0b48f4bf4
check template result Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b48f4bf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b48f4bf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b48f4bf Branch: refs/heads/pytest Commit: 0b48f4bf434b9d181cf5821f453f2a7c50a1138d Parents: 8b7f88a Author: edison su <sudi...@gmail.com> Authored: Fri Sep 26 00:42:33 2014 +0000 Committer: edison su <sudi...@gmail.com> Committed: Fri Sep 26 00:42:33 2014 +0000 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b48f4bf/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 93cd6d0..f1fcc81 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -850,7 +850,7 @@ class DeployDataCenters(object): retries = 5 * 60 / 10 while retries > 0: template = get_template(apiClient, zone.id) - if template: + if template is not None and template != "FAILED": return SUCCESS self.__tcRunLogger.debug("waiting for user vm template is up") retries -= 1
