diff --git a/requirements/requirements.in b/requirements/requirements.in index 2182c5aada..2a30d786b0 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -38,6 +38,7 @@ python-memcached==1.58 python-radius==1.0 python-saml==2.2.0 python-social-auth==0.2.21 +pyvmomi==6.5 redbaron==0.6.2 requests-futures==0.9.7 service-identity==16.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 4d3d27b1de..bfff181962 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -7,7 +7,7 @@ git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding -git+https://github.com/ansible/django-jsonbfield@master#egg=jsonbfield +git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax adal==0.4.3 # via msrestazure amqp==1.4.9 # via kombu @@ -19,7 +19,7 @@ asgiref==1.0.0 # via asgi-amqp, channels, daphne attrs==16.3.0 # via service-identity autobahn==0.17.0 # via daphne azure-batch==1.0.0 # via azure -azure-common[autorest]==1.1.4 # via azure-batch, azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-keyvault, azure-mgmt-logic, azure-mgmt-network, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-storage, azure-servicebus, azure-servicemanagement-legacy, azure-storage +azure-common==1.1.4 # via azure-batch, azure-mgmt-batch, azure-mgmt-compute, azure-mgmt-keyvault, azure-mgmt-logic, azure-mgmt-network, azure-mgmt-redis, azure-mgmt-resource, azure-mgmt-scheduler, azure-mgmt-storage, azure-servicebus, azure-servicemanagement-legacy, azure-storage azure-mgmt-batch==1.0.0 # via azure-mgmt azure-mgmt-compute==0.30.0rc6 # via azure-mgmt azure-mgmt-keyvault==0.30.0rc6 # via azure-mgmt @@ -36,14 +36,14 @@ azure-servicebus==0.20.3 # via azure azure-servicemanagement-legacy==0.20.4 # via azure azure-storage==0.33.0 # via azure 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 backports.functools-lru-cache==1.3 # via jaraco.functools backports.ssl-match-hostname==3.5.0.1 # via websocket-client baron==0.6.2 # via redbaron billiard==3.3.0.23 # via celery boto==2.43.0 celery==3.1.17 -#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 ' +#certifi==2016.9.26 # via msrest cffi==1.9.1 # via cryptography channels==0.17.3 chardet==2.3.0 # via msrest @@ -66,7 +66,7 @@ django-solo==1.1.2 django-split-settings==0.2.2 django-taggit==0.21.3 django-transaction-hooks==0.2 -Django==1.8.16 # via channels, django-auth-ldap, django-crum, django-split-settings, django-transaction-hooks +django==1.8.16 djangorestframework-yaml==1.0.3 djangorestframework==3.3.3 dogpile.cache==0.6.2 # via python-ironicclient, shade @@ -128,7 +128,7 @@ oslo.utils==3.20.0 # via osc-lib, oslo.serialization, python-cinderclient pbr==1.10.0 # via cliff, debtcollector, keystoneauth1, mock, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient, requestsexceptions, shade, stevedore pexpect==3.1 positional==1.1.1 # via keystoneauth1, python-keystoneclient -PrettyTable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-heatclient, python-ironicclient, python-magnumclient, python-novaclient, python-troveclient +prettytable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-heatclient, python-ironicclient, python-magnumclient, python-novaclient, python-troveclient psphere==0.5.2 psutil==5.0.0 psycopg2==2.6.2 @@ -136,8 +136,8 @@ pyasn1-modules==0.0.8 # via service-identity pyasn1==0.1.9 # via cryptography, pyasn1-modules, service-identity pycparser==2.17 # via cffi pygerduty==0.35.1 -PyJWT==1.4.2 # via adal, python-social-auth -pyOpenSSL==16.2.0 # via service-identity +pyjwt==1.4.2 # via adal, python-social-auth +pyopenssl==16.2.0 pyparsing==2.1.10 # via cliff, cmd2, oslo.utils pyrad==2.0 # via django-radius python-cinderclient==1.9.0 # via python-openstackclient, shade @@ -162,7 +162,8 @@ python-social-auth==0.2.21 python-swiftclient==3.2.0 # via python-heatclient, python-troveclient, shade python-troveclient==2.7.0 # via shade pytz==2016.10 # via babel, celery, irc, oslo.serialization, oslo.utils, tempora, twilio -PyYAML==3.12 # via cliff, djangorestframework-yaml, os-client-config, psphere, python-heatclient, python-ironicclient, python-mistralclient +pyvmomi==6.5 +pyyaml==3.12 # via cliff, djangorestframework-yaml, os-client-config, psphere, python-heatclient, python-ironicclient, python-mistralclient rackspace-auth-openstack==1.3 # via rackspace-novaclient rackspace-novaclient==2.1 rax-default-network-flags-python-novaclient-ext==0.4.0 # via rackspace-novaclient @@ -170,7 +171,7 @@ rax-scheduled-images-python-novaclient-ext==0.3.1 # via rackspace-novaclient redbaron==0.6.2 requests-futures==0.9.7 requests-oauthlib==0.7.0 # via msrest, python-social-auth -requests==2.11.1 # via adal, azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-social-auth, python-swiftclient, python-troveclient, requests-futures, requests-oauthlib, slackclient +requests==2.11.1 # via adal, azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-social-auth, python-swiftclient, python-troveclient, pyvmomi, requests-futures, requests-oauthlib, slackclient requestsexceptions==1.1.3 # via os-client-config, shade rfc3986==0.4.1 # via oslo.config rply==0.7.4 # via baron @@ -178,7 +179,7 @@ secretstorage==2.3.1 # via keyring service-identity==16.0.0 shade==1.13.1 simplejson==3.10.0 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient, python-troveclient -six==1.10.0 # via asgi-amqp, asgiref, autobahn, cliff, cryptography, debtcollector, django-extensions, irc, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, keystoneauth1, mock, more-itertools, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pygerduty, pyopenssl, pyrad, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-memcached, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-social-auth, python-swiftclient, python-troveclient, shade, slackclient, stevedore, tempora, twilio, txaio, warlock, websocket-client +six==1.10.0 # via asgi-amqp, asgiref, autobahn, cliff, cryptography, debtcollector, django-extensions, irc, jaraco.classes, jaraco.collections, jaraco.itertools, jaraco.logging, jaraco.stream, keystoneauth1, mock, more-itertools, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pygerduty, pyopenssl, pyrad, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-memcached, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-social-auth, python-swiftclient, python-troveclient, pyvmomi, shade, slackclient, stevedore, tempora, twilio, txaio, warlock, websocket-client slackclient==1.0.2 stevedore==1.19.1 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-designateclient, python-keystoneclient, python-magnumclient suds==0.4 # via psphere diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index 8027e6a92f..3ac5ad0d21 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -5,5 +5,6 @@ kombu==3.0.35 boto==2.43.0 psphere==0.5.2 psutil==5.0.0 +pyvmomi==6.5 secretstorage==2.3.1 shade==1.13.1 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index b1a669bc91..02e324b400 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file requirements_ansible.txt requirements_ansible.in +# pip-compile --output-file requirements/requirements_ansible.txt requirements/requirements_ansible.in # git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax adal==0.4.3 # via msrestazure @@ -30,12 +30,12 @@ azure-storage==0.33.0 # via azure 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 boto==2.43.0 -#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 ' +#certifi==2016.9.26 # via msrest cffi==1.9.1 # via cryptography chardet==2.3.0 # via msrest cliff==2.3.0 # via osc-lib, python-designateclient, python-heatclient, python-mistralclient, python-neutronclient, python-openstackclient cmd2==0.6.9 # via cliff -cryptography==1.6 # via adal, azure-storage, python-magnumclient, secretstorage +cryptography==1.7.1 # via adal, azure-storage, python-magnumclient, secretstorage debtcollector==1.10.0 # via oslo.config, oslo.utils, python-designateclient, python-keystoneclient, python-neutronclient decorator==4.0.10 # via python-magnumclient, shade dogpile.cache==0.6.2 # via python-ironicclient, shade @@ -59,21 +59,21 @@ mock==2.0.0 monotonic==1.2 # via oslo.utils msgpack-python==0.4.8 # via oslo.serialization msrest==0.4.4 # via azure-common, msrestazure -msrestazure==0.4.5 # via azure-common +msrestazure==0.4.6 # via azure-common munch==2.0.4 # via shade netaddr==0.7.18 # via oslo.config, oslo.utils, python-neutronclient netifaces==0.10.5 # via oslo.utils, shade oauthlib==2.0.1 # via requests-oauthlib -openstacksdk==0.9.10 # via python-openstackclient +openstacksdk==0.9.11 # via python-openstackclient os-client-config==1.24.0 # via openstacksdk, osc-lib, python-magnumclient, python-neutronclient, shade os-diskconfig-python-novaclient-ext==0.1.3 # via rackspace-novaclient os-networksv2-python-novaclient-ext==0.26 # via rackspace-novaclient os-virtual-interfacesv2-python-novaclient-ext==0.20 # via rackspace-novaclient osc-lib==1.2.0 # via python-designateclient, python-heatclient, python-ironicclient, python-mistralclient, python-neutronclient, python-openstackclient -oslo.config==3.20.0 # via python-keystoneclient +oslo.config==3.21.0 # via python-keystoneclient oslo.i18n==3.11.0 # via osc-lib, oslo.config, oslo.utils, python-cinderclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient oslo.serialization==2.15.0 # via python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-neutronclient, python-novaclient -oslo.utils==3.19.0 # via osc-lib, oslo.serialization, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient +oslo.utils==3.20.0 # via osc-lib, oslo.serialization, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient pbr==1.10.0 # via cliff, debtcollector, keystoneauth1, mock, openstacksdk, osc-lib, oslo.i18n, oslo.serialization, oslo.utils, positional, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-troveclient, requestsexceptions, shade, stevedore positional==1.1.1 # via keystoneauth1, python-keystoneclient PrettyTable==0.7.2 # via cliff, python-cinderclient, python-glanceclient, python-heatclient, python-ironicclient, python-magnumclient, python-novaclient, python-troveclient @@ -85,33 +85,34 @@ PyJWT==1.4.2 # via adal pyparsing==2.1.10 # via cliff, cmd2, oslo.utils python-cinderclient==1.9.0 # via python-openstackclient, shade python-dateutil==2.6.0 # via adal, azure-storage -python-designateclient==2.3.0 # via shade +python-designateclient==2.4.0 # via shade python-glanceclient==2.5.0 # via python-openstackclient, shade -python-heatclient==1.6.1 # via shade +python-heatclient==1.7.0 # via shade python-ironicclient==1.8.0 # via shade python-keystoneclient==3.8.0 # via python-glanceclient, python-mistralclient, python-openstackclient, shade python-magnumclient==2.3.1 # via shade python-mistralclient==2.1.2 # via python-troveclient python-neutronclient==6.0.0 # via shade python-novaclient==6.0.0 # via ip-associations-python-novaclient-ext, os-diskconfig-python-novaclient-ext, os-networksv2-python-novaclient-ext, os-virtual-interfacesv2-python-novaclient-ext, python-openstackclient, rackspace-auth-openstack, rackspace-novaclient, rax-default-network-flags-python-novaclient-ext, rax-scheduled-images-python-novaclient-ext, shade -python-openstackclient==3.4.1 # via python-ironicclient +python-openstackclient==3.5.0 # via python-ironicclient python-swiftclient==3.2.0 # via python-heatclient, python-troveclient, shade -python-troveclient==2.6.0 # via shade +python-troveclient==2.7.0 # via shade pytz==2016.10 # via babel, oslo.serialization, oslo.utils +pyvmomi==6.5 PyYAML==3.12 # via cliff, os-client-config, psphere, python-heatclient, python-ironicclient, python-mistralclient rackspace-auth-openstack==1.3 # via rackspace-novaclient rackspace-novaclient==2.1 rax-default-network-flags-python-novaclient-ext==0.4.0 # via rackspace-novaclient rax-scheduled-images-python-novaclient-ext==0.3.1 # via rackspace-novaclient requests-oauthlib==0.7.0 # via msrest -requests==2.11.1 # via adal, azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-swiftclient, python-troveclient, requests-oauthlib +requests==2.11.1 # via adal, azure-servicebus, azure-servicemanagement-legacy, azure-storage, keystoneauth1, msrest, python-cinderclient, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-swiftclient, python-troveclient, pyvmomi, requests-oauthlib requestsexceptions==1.1.3 # via os-client-config, shade rfc3986==0.4.1 # via oslo.config secretstorage==2.3.1 shade==1.13.1 simplejson==3.10.0 # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient, python-troveclient -six==1.10.0 # via cliff, cryptography, debtcollector, keystoneauth1, mock, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-swiftclient, python-troveclient, shade, stevedore, warlock -stevedore==1.19.0 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-designateclient, python-keystoneclient, python-magnumclient +six==1.10.0 # via cliff, cryptography, debtcollector, keystoneauth1, mock, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, python-cinderclient, python-dateutil, python-designateclient, python-glanceclient, python-heatclient, python-ironicclient, python-keystoneclient, python-magnumclient, python-mistralclient, python-neutronclient, python-novaclient, python-openstackclient, python-swiftclient, python-troveclient, pyvmomi, shade, stevedore, warlock +stevedore==1.19.1 # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-designateclient, python-keystoneclient, python-magnumclient suds==0.4 # via psphere unicodecsv==0.14.1 # via cliff warlock==1.2.0 # via python-glanceclient