ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

made boto3 non mandatory

Browse source
This commit is contained in:
Brian Coca 2015-09-18 08:04:58 -04:00
parent fdb1c14004
commit d7b61db6dc
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/ec2.py
View file

@ -25,7 +25,13 @@
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import os, boto3 import os
try:
import boto3
HAS_BOTO3 = True
except:
HAS_BOTO3 = False
try: try:
from distutils.version import LooseVersion from distutils.version import LooseVersion
@ -74,7 +80,7 @@ def boto_supports_profile_name():
return hasattr(boto.ec2.EC2Connection, 'profile_name') return hasattr(boto.ec2.EC2Connection, 'profile_name')
def get_aws_connection_info(module, boto3=False): def get_aws_connection_info(module):
# Check module args for credentials, then check environment vars # Check module args for credentials, then check environment vars
# access_key # access_key
@ -135,7 +141,7 @@ def get_aws_connection_info(module, boto3=False):
# in case security_token came in as empty string # in case security_token came in as empty string
security_token = None security_token = None
if boto3: if HAS_BOTO3:
boto_params = dict(aws_access_key_id=access_key, boto_params = dict(aws_access_key_id=access_key,
aws_secret_access_key=secret_key, aws_secret_access_key=secret_key,
aws_session_token=security_token) aws_session_token=security_token)