From 0a0844f40e0b95d7c4ed8cede89a55aa45db26bb Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Mon, 4 Aug 2014 09:38:42 -0500 Subject: [PATCH] Require pycrypto >= 2.6 for gce.py --- awx/plugins/inventory/gce.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/awx/plugins/inventory/gce.py b/awx/plugins/inventory/gce.py index c8eeb43ab1..2da449fb20 100755 --- a/awx/plugins/inventory/gce.py +++ b/awx/plugins/inventory/gce.py @@ -72,6 +72,14 @@ Author: Eric Johnson Version: 0.0.1 ''' +# We need to use pycrypto >= 2.6 +# These lines are necessary because some of the Ansible OS packages install +# pycrypto 2.0, and it's actually possible through OS packaging to have 2.0 and +# 2.6 installed alongside one another, and 2.0 can then win on precedence +# order. This gets around that. +__requires__ = ['pycrypto>=2.6'] +import pkg_resources + USER_AGENT_PRODUCT="Ansible-gce_inventory_plugin" USER_AGENT_VERSION="v1"