a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow to work with latest Azure Python SDK (#15467) 

* Allow to work with latest Azure Python SDK

* Fixed so that errors are sent to stderr
pull/4420/head
Chris Houseknecht 2016-04-21 23:18:45 -04:00 committed by Brian Coca
parent 76f73dc81f
commit 2b7f4395d6
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/inventory/windows_azure.py
View File

@ -47,13 +47,9 @@ except ImportError:
import simplejson as json import simplejson as json
try: try:
import azure
from azure import WindowsAzureError
from azure.servicemanagement import ServiceManagementService from azure.servicemanagement import ServiceManagementService
except ImportError as e: except ImportError as e:
print("failed=True msg='`azure` library required for this script'") sys.exit("ImportError: {0}".format(str(e)))
sys.exit(1)
# Imports for ansible # Imports for ansible
import ConfigParser import ConfigParser
@ -194,11 +190,8 @@ class AzureInventory(object):
try: try:
for cloud_service in self.sms.list_hosted_services(): for cloud_service in self.sms.list_hosted_services():
self.add_deployments(cloud_service) self.add_deployments(cloud_service)
except WindowsAzureError as e: except Exception as e:
print("Looks like Azure's API is down:") sys.exit("Error: Failed to access cloud services - {0}".format(str(e)))
print("")
print(e)
sys.exit(1)
def add_deployments(self, cloud_service): def add_deployments(self, cloud_service):
"""Makes an Azure API call to get the list of virtual machines """Makes an Azure API call to get the list of virtual machines
@ -207,11 +200,8 @@ class AzureInventory(object):
try: try:
for deployment in self.sms.get_hosted_service_properties(cloud_service.service_name,embed_detail=True).deployments.deployments: for deployment in self.sms.get_hosted_service_properties(cloud_service.service_name,embed_detail=True).deployments.deployments:
self.add_deployment(cloud_service, deployment) self.add_deployment(cloud_service, deployment)
except WindowsAzureError as e: except Exception as e:
print("Looks like Azure's API is down:") sys.exit("Error: Failed to access deployments - {0}".format(str(e)))
print("")
print(e)
sys.exit(1)
def add_deployment(self, cloud_service, deployment): def add_deployment(self, cloud_service, deployment):
"""Adds a deployment to the inventory and index""" """Adds a deployment to the inventory and index"""