From 7aa94a9bb583e80752a15bb4edb4f5d8ea3b75d3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 6 Sep 2019 15:30:08 -0400 Subject: [PATCH] Update assorted cloud module requirements. Update boto3 for ec2_transit_gateway module. Update Azure requirements to sync with Ansible 2.9 branch. --- requirements/requirements_ansible.in | 6 ++++-- requirements/requirements_ansible.txt | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index 7bae1be81f..dad50184ce 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -2,7 +2,7 @@ apache-libcloud==2.5.0 google-auth==1.6.2 # needed for gce inventory imports # Azure -# azure deps from https://github.com/ansible/ansible/blob/stable-2.8/packaging/requirements/requirements-azure.txt +# azure deps from https://github.com/ansible/ansible/blob/stable-2.9/packaging/requirements/requirements-azure.txt packaging azure-cli-core==2.0.35 azure-cli-nspkg==3.0.2 @@ -38,9 +38,11 @@ azure-mgmt-cosmosdb==0.5.2 azure-mgmt-hdinsight==0.1.0 azure-mgmt-devtestlabs==3.0.0 azure-mgmt-loganalytics==0.2.0 +azure-mgmt-automation==0.1.1 +azure-mgmt-iothub==0.7.0 # AWS boto==2.47.0 # last which does not break ec2 scripts -boto3==1.6.2 +boto3==1.9.223 jinja2==2.10.1 # required for native jinja2 types for inventory compat mode # netconf for network modules ncclient==0.6.3 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index 516a834797..cae09fbdcb 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -10,6 +10,7 @@ azure-common==1.1.11 azure-graphrbac==0.40.0 azure-keyvault==1.0.0a1 azure-mgmt-authorization==0.51.1 +azure-mgmt-automation==0.1.1 azure-mgmt-batch==5.0.1 azure-mgmt-cdn==3.0.0 azure-mgmt-compute==4.4.0 @@ -20,6 +21,7 @@ azure-mgmt-cosmosdb==0.5.2 azure-mgmt-devtestlabs==3.0.0 azure-mgmt-dns==2.1.0 azure-mgmt-hdinsight==0.1.0 +azure-mgmt-iothub==0.7.0 azure-mgmt-keyvault==1.1.0 azure-mgmt-loganalytics==0.2.0 azure-mgmt-marketplaceordering==0.1.0 @@ -38,9 +40,9 @@ azure-nspkg==2.0.0 azure-storage==0.35.1 backports.ssl-match-hostname==3.5.0.1 bcrypt==3.1.6 # via paramiko -boto3==1.6.2 +boto3==1.9.223 boto==2.47.0 -botocore==1.9.23 # via boto3, s3transfer +botocore==1.12.223 # via boto3, s3transfer cachetools==3.1.0 # via google-auth certifi==2019.3.9 # via msrest, requests cffi==1.12.3 # via bcrypt, cryptography, pynacl @@ -103,13 +105,13 @@ requests-oauthlib==1.2.0 # via msrest requests==2.21.0 requestsexceptions==1.4.0 # via openstacksdk rsa==4.0 # via google-auth -s3transfer==0.1.13 # via boto3 +s3transfer==0.2.1 # via boto3 selectors2==2.0.1 # via ncclient six==1.12.0 # via azure-cli-core, bcrypt, cryptography, google-auth, isodate, keystoneauth1, knack, munch, ncclient, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, pyvmomi, pywinrm, requests-credssp, stevedore stevedore==1.30.1 # via keystoneauth1 tabulate==0.8.2 # via azure-cli-core, knack typing==3.6.6; python_version < "3" # via msrest -urllib3==1.24.3 # via requests +urllib3==1.24.3 # via botocore, requests wheel==0.30.0 # via azure-cli-core xmltodict==0.12.0 # via pywinrm