External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-10 12:39:22 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4420 from chrismeyersfsu/fix-certs

Browse Source 
fix gce and maybe azure cert issues
This commit is contained in:
Chris Meyers
2016-12-13 17:12:15 -05:00
committed by GitHub
parent f89bd15bf5 44c6127a48
commit f168416864
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements.txt
View File

@@ -45,7 +45,7 @@ baron==0.6.2 # via redbaron
billiard==3.3.0.23 # via celery billiard==3.3.0.23 # via celery
boto==2.43.0 boto==2.43.0
celery==3.1.17 celery==3.1.17
certifi==2016.9.26 # via msrest #certifi==2016.9.26 # via msrest --- chris meyers removed this because it fails gce inv sync and azure "classic". By removing this, we coerce libcloud into using the cert file '/etc/pki/tls/certs/ca-bundle.crt '
cffi==1.9.1 # via cryptography cffi==1.9.1 # via cryptography
channels==0.17.3 channels==0.17.3
chardet==2.3.0 # via msrest chardet==2.3.0 # via msrest

2
requirements/requirements_ansible.txt
View File

@@ -30,7 +30,7 @@ azure-storage==0.33.0 # via azure
azure==2.0.0rc6 azure==2.0.0rc6
Babel==2.3.4 # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-heatclient, python-magnumclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient Babel==2.3.4 # via osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-heatclient, python-magnumclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient
boto==2.43.0 boto==2.43.0
certifi==2016.9.26 # via msrest #certifi==2016.9.26 # via msrest --- chris meyers removed this because it fails gce inv sync and azure "classic". By removing this, we coerce libcloud into using the cert file '/etc/pki/tls/certs/ca-bundle.crt '
cffi==1.9.1 # via cryptography cffi==1.9.1 # via cryptography
chardet==2.3.0 # via msrest chardet==2.3.0 # via msrest
cliff==2.3.0 # via osc-lib, python-designateclient, python-heatclient, python-mistralclient, python-neutronclient, python-openstackclient cliff==2.3.0 # via osc-lib, python-designateclient, python-heatclient, python-mistralclient, python-neutronclient, python-openstackclient