Merge pull request #598 from cdosborn/upgrade-to-rtwo-0.5.17

Upgrade to latest rtwo
cyverse · Apr 24, 2018 · 9bdbfd7 · 9bdbfd7
2 parents 0ebcfc5 + 5592cdd
commit 9bdbfd7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ## [Unreleased](https://github.com/cyverse/atmosphere/compare/v32-1...HEAD)
 ### Fixed
  - Quota updates concerning volumes would silently fail ([#611](https://github.com/cyverse/atmosphere/pull/611))
+ - Fix monitor_instances_for timing out, upgrade to rtwo version 0.5.18 ([#598](https://github.com/cyverse/atmosphere/pull/598))
 
 ## [v32-1](https://github.com/cyverse/atmosphere/compare/v32-0...v32-1) - 2018-04-17
 ### Added

diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -155,6 +155,7 @@ pyperclip==1.5.27
 python-cinderclient==1.9.0
 python-dateutil==2.6.1
 python-glanceclient==2.5.0
+python-heatclient==1.11.0
 python-irodsclient==0.6.0
 python-keystoneclient==3.6.0
 python-ldap==2.4.41
@@ -174,7 +175,7 @@ requirements-detector==0.5.2  # via prospector
 rfc3986==1.1.0
 rfive==0.2.0
 rsa==3.4.2
-rtwo==0.5.13
+rtwo==0.5.18
 scandir==1.5              # via pathlib2
 selenium==3.5.0           # via splinter
 setoptconf==0.2.0         # via prospector

diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,7 @@ ansible==2.3.2.0          # via subspace
 apache-libcloud==0.20.1
 appdirs==1.4.3            # via os-client-config
 asn1crypto==0.22.0        # via cryptography
-babel==2.5.1              # via flower, osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
+babel==2.5.1              # via flower, osc-lib, oslo.i18n, python-cinderclient, python-glanceclient, python-heatclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
 backports-abc==0.5        # via tornado
 backports.ssl-match-hostname==3.5.0.1  # via apache-libcloud, tornado
 bcrypt==3.1.3             # via paramiko
@@ -22,7 +22,7 @@ certifi==2017.7.27.1      # via requests, tornado
 cffi==1.10.0              # via bcrypt, cryptography, pynacl
 chardet==3.0.4            # via requests
 chromogenic==0.4.17
-cliff==2.8.0              # via osc-lib, python-neutronclient, python-openstackclient
+cliff==2.8.0              # via osc-lib, python-heatclient, python-neutronclient, python-openstackclient
 cmd2==0.7.5               # via cliff
 colorama==0.3.9
 contextlib2==0.5.5        # via raven
@@ -56,14 +56,14 @@ greenlet==0.4.12          # via eventlet, gevent
 httplib2==0.10.3          # via oauth2client
 idna==2.5                 # via cryptography, requests
 ipaddress==1.0.18         # via cryptography
-iso8601==0.1.12           # via keystoneauth1, oslo.utils, python-neutronclient, python-novaclient
+iso8601==0.1.12           # via keystoneauth1, oslo.utils, python-heatclient, python-neutronclient, python-novaclient
 itsdangerous==0.24
 jinja2==2.9.6
 jsonpatch==1.16           # via openstacksdk, warlock
 jsonpointer==1.10         # via jsonpatch
 jsonschema==2.6.0         # via warlock
 jwt.py==0.1.0             # via django-cyverse-auth
-keystoneauth1==3.1.0      # via django-cyverse-auth, openstacksdk, os-client-config, osc-lib, python-cinderclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
+keystoneauth1==3.1.0      # via django-cyverse-auth, openstacksdk, os-client-config, osc-lib, python-cinderclient, python-heatclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
 kombu==4.1.0              # via celery
 markupsafe==1.0           # via jinja2
 monotonic==1.3            # via oslo.log, oslo.utils
@@ -76,19 +76,19 @@ oauth2client==4.1.2       # via django-cyverse-auth
 olefile==0.44             # via pillow
 openstacksdk==0.9.17      # via python-openstackclient
 os-client-config==1.28.0  # via openstacksdk, osc-lib, python-neutronclient
-osc-lib==1.7.0            # via python-neutronclient, python-openstackclient, python-saharaclient
+osc-lib==1.7.0            # via python-heatclient, python-neutronclient, python-openstackclient, python-saharaclient
 oslo.config==4.11.0       # via oslo.log, python-keystoneclient
 oslo.context==2.17.0      # via oslo.log
-oslo.i18n==3.17.0         # via osc-lib, oslo.config, oslo.log, oslo.utils, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
+oslo.i18n==3.17.0         # via osc-lib, oslo.config, oslo.log, oslo.utils, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
 oslo.log==3.30.0          # via python-saharaclient
-oslo.serialization==2.20.0  # via oslo.log, python-keystoneclient, python-neutronclient, python-novaclient, python-saharaclient
-oslo.utils==3.28.0        # via osc-lib, oslo.log, oslo.serialization, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
+oslo.serialization==2.20.0  # via oslo.log, python-heatclient, python-keystoneclient, python-neutronclient, python-novaclient, python-saharaclient
+oslo.utils==3.28.0        # via osc-lib, oslo.log, oslo.serialization, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient
 pandas==0.20.3
 paramiko==2.2.1           # via ansible, fabric
-pbr==3.1.1                # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.context, oslo.i18n, oslo.log, oslo.serialization, oslo.utils, positional, python-cinderclient, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient, rtwo, stevedore
+pbr==3.1.1                # via cliff, debtcollector, keystoneauth1, openstacksdk, osc-lib, oslo.context, oslo.i18n, oslo.log, oslo.serialization, oslo.utils, positional, python-cinderclient, python-glanceclient, python-heatclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient, stevedore
 pillow==4.2.1
 positional==1.2.1         # via keystoneauth1, oslo.context, python-keystoneclient
-prettytable==0.7.2        # via cliff, python-cinderclient, python-glanceclient, python-irodsclient, python-novaclient
+prettytable==0.7.2        # via cliff, python-cinderclient, python-glanceclient, python-heatclient, python-irodsclient, python-novaclient
 psycopg2==2.7.3
 pyasn1-modules==0.0.11    # via oauth2client
 pyasn1==0.3.2             # via oauth2client, paramiko, pyasn1-modules, rsa
@@ -103,6 +103,7 @@ pyperclip==1.5.27         # via cmd2
 python-cinderclient==1.9.0  # via python-openstackclient, rtwo
 python-dateutil==2.6.1
 python-glanceclient==2.5.0  # via python-openstackclient, rtwo
+python-heatclient==1.11.0  # via rtwo
 python-irodsclient==0.6.0  # via rtwo
 python-keystoneclient==3.6.0  # via django-cyverse-auth, python-glanceclient, python-openstackclient, rtwo
 python-ldap==2.4.41
@@ -111,20 +112,20 @@ python-neutronclient==6.0.0  # via rtwo
 python-novaclient==6.0.0  # via python-openstackclient, rtwo
 python-openstackclient==3.3.0  # via python-saharaclient, rtwo
 python-saharaclient==1.2.0  # via rtwo
-python-swiftclient==3.3.0  # via rtwo
+python-swiftclient==3.3.0  # via python-heatclient, rtwo
 pytz==2017.2
-pyyaml==3.12              # via ansible, cliff, djangorestframework-yaml, os-client-config, oslo.config
+pyyaml==3.12              # via ansible, cliff, djangorestframework-yaml, os-client-config, oslo.config, python-heatclient
 raven==6.1.0
 redis==2.10.5
 requests[security]==2.18.3
 requestsexceptions==1.3.0  # via os-client-config
 rfc3986==1.1.0            # via oslo.config
 rfive==0.2.0              # via rtwo
 rsa==3.4.2                # via oauth2client
-rtwo==0.5.13
+rtwo==0.5.18
 simplejson==3.11.1        # via osc-lib, python-cinderclient, python-neutronclient, python-novaclient
 singledispatch==3.4.0.3   # via tornado
-six==1.11.0               # via bcrypt, cliff, cmd2, cryptography, debtcollector, djangorestframework-csv, keystoneauth1, oauth2client, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.log, oslo.serialization, oslo.utils, pynacl, pyopenssl, python-cinderclient, python-dateutil, python-glanceclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient, python-swiftclient, singledispatch, stevedore, warlock
+six==1.11.0               # via bcrypt, cliff, cmd2, cryptography, debtcollector, djangorestframework-csv, keystoneauth1, oauth2client, openstacksdk, osc-lib, oslo.config, oslo.i18n, oslo.log, oslo.serialization, oslo.utils, pynacl, pyopenssl, python-cinderclient, python-dateutil, python-glanceclient, python-heatclient, python-keystoneclient, python-neutronclient, python-novaclient, python-openstackclient, python-saharaclient, python-swiftclient, singledispatch, stevedore, warlock
 stevedore==1.25.0         # via cliff, keystoneauth1, openstacksdk, osc-lib, oslo.config, python-keystoneclient
 subspace==0.5.1
 threepio==0.2.0

diff --git a/service/accounts/openstack_manager.py b/service/accounts/openstack_manager.py
@@ -1218,7 +1218,7 @@ def get_glance_client(self, all_creds):
 
     def get_neutron_client(self, all_creds):
         net_creds = self._build_network_creds(all_creds)
-        neutron, _ = self.network_manager.new_connection(**net_creds)
+        neutron, _, _ = self.network_manager.new_connection(**net_creds)
         return neutron
 
     def get_user_clients(self, all_creds):