PSARC/2014/207 OpenStack Glance Update to Havana
PSARC/2014/208 OpenStack Cinder Update to Havana
PSARC/2014/209 OpenStack Keystone Update to Havana
PSARC/2014/210 OpenStack Nova Update to Havana
18416146 Neutron agents (L3 and DHCP) should cleanup resources when they are disabled
18562372 Failed to create a new project under Horizon
18645763 ZFSSA Cinder Driver support
18686327 evs agent silently ignores user-specified pool allocation ranges
18702697 fibre channel volumes should be supported in the cinder volume driver
18734289 nova won't terminate failed kz deployments
18738371 cinder-volume:setup should account for commented-out zfs_volume_base
18738374 cinder-volume:setup should check for existence of configuration file
18826190 nova-compute fails due to nova.utils.to_bytes
18855698 Update OpenStack to Havana 2013.2.3
18855710 Update python-cinderclient to 1.0.9
18855743 Update python-keystoneclient to 0.8.0
18855754 Update python-neutronclient to 2.3.4
18855764 Update python-novaclient to 2.17.0
18855793 Update python-swiftclient to 2.1.0
18856992 External networks can be deleted even when floating IP addresses are in use
18857784 bake in some more openstack configuration
18884923 Incorrect locale facets in python modules for openstack
18913890 the error in _get_view_and_lun may cause the failure of deleting volumes
18943044 Disable 'Security Groups' tab in Horizon dashboard
18969275 problem in SERVICE/KEYSTONE
This upstream patch addresses Launchpad bug 1178740. Although it's been
addressed in Icehouse 2014.1, the patch below is still not yet released
for Havana.
commit 4f800bbe7f5ba07895a4cb32c14007e2f1818bd7
Author: Lei Zhang <[email protected]>
Date: Tue Oct 8 17:40:37 2013 +0800
remove the nova dependency in the ec2_token middleware
Change-Id: I34812522b55e38d3ea030638bbae75d65f507c90
Closes-Bug: #1178740
diff --git a/keystone/middleware/ec2_token.py b/keystone/middleware/ec2_token.py
index 0cd5841..4e58eac 100644
--- a/keystone/middleware/ec2_token.py
+++ b/keystone/middleware/ec2_token.py
@@ -25,18 +25,22 @@ Starting point for routing EC2 requests.
import urlparse
from eventlet.green import httplib
+from oslo.config import cfg
import webob.dec
import webob.exc
-from nova import flags
-from nova import utils
-from nova import wsgi
+from keystone.common import config
+from keystone.common import wsgi
+from keystone.openstack.common import jsonutils
+keystone_ec2_opts = [
+ cfg.StrOpt('keystone_ec2_url',
+ default='http://localhost:5000/v2.0/ec2tokens',
+ help='URL to get token from ec2 request.'),
+]
-FLAGS = flags.FLAGS
-flags.DEFINE_string('keystone_ec2_url',
- 'http://localhost:5000/v2.0/ec2tokens',
- 'URL to get token from ec2 request.')
+CONF = config.CONF
+CONF.register_opts(keystone_ec2_opts)
class EC2Token(wsgi.Middleware):
@@ -67,13 +71,13 @@ class EC2Token(wsgi.Middleware):
'params': auth_params,
}
}
- creds_json = utils.dumps(creds)
+ creds_json = jsonutils.dumps(creds)
headers = {'Content-Type': 'application/json'}
# Disable 'has no x member' pylint error
# for httplib and urlparse
# pylint: disable-msg=E1101
- o = urlparse.urlparse(FLAGS.keystone_ec2_url)
+ o = urlparse.urlparse(CONF.keystone_ec2_url)
if o.scheme == 'http':
conn = httplib.HTTPConnection(o.netloc)
else:
@@ -86,7 +90,7 @@ class EC2Token(wsgi.Middleware):
# having keystone return token, tenant,
# user, and roles from this call.
- result = utils.loads(response)
+ result = jsonutils.loads(response)
try:
token_id = result['access']['token']['id']
except (AttributeError, KeyError):