openstack/keystone
Code Issues Proposed changes

Merge "drop developer support for OS X"

Browse Source
This commit is contained in:
Jenkins 2014-12-03 08:14:08 +00:00 committed by Gerrit Code Review
commit d82a3caa32
6 changed files with 14 additions and 29 deletions

10
doc/source/setup.rst

@ -32,7 +32,7 @@ Prerequisites
This document assumes you are using:
- Ubuntu, Fedora, or Mac OS X
- Ubuntu or Fedora
- `Python 2.7`_
.. _`Python 2.7`: http://www.python.org/
@ -99,14 +99,6 @@ Fedora 19+:
$ sudo yum install python-sqlite2 python-lxml python-greenlet-devel python-ldap sqlite-devel openldap-devel python-devel libxslt-devel openssl-devel
Mac OS X 10.9 (requires Homebrew_):
.. code-block:: bash
$ brew install python openssl gettext libxmlsec1
.. _Homebrew: http://brew.sh/
PyPi Packages and VirtualEnv
----------------------------

9
etc/keystone.conf.sample

@ -103,8 +103,8 @@
#tcp_keepalive=false
# Sets the value of TCP_KEEPIDLE in seconds for each server
# socket. Only applies if tcp_keepalive is true. Not supported
# on OS X. (integer value)
# socket. Only applies if tcp_keepalive is true. (integer
# value)
#tcp_keepidle=600
# The maximum number of entities that will be returned in a
@ -664,8 +664,9 @@
# Deprecated group/name - [DATABASE]/sql_max_pool_size
#max_pool_size=<None>
# Maximum db connection retries during startup. Set to -1 to
# specify an infinite retry count. (integer value)
# Maximum number of database connection retries during
# startup. Set to -1 to specify an infinite retry count.
# (integer value)
# Deprecated group/name - [DEFAULT]/sql_max_retries
# Deprecated group/name - [DATABASE]/sql_max_retries
#max_retries=10

2
keystone/common/config.py

@ -118,7 +118,7 @@ FILE_OPTIONS = {
default=600,
help='Sets the value of TCP_KEEPIDLE in seconds for each '
'server socket. Only applies if tcp_keepalive is '
'true. Not supported on OS X.'),
'true.'),
cfg.IntOpt('list_limit',
help='The maximum number of entities that will be '
'returned in a collection, with no limit set by '

3
keystone/common/environment/eventlet_server.py

@ -130,8 +130,7 @@ class Server(object):
if self.keepalive:
dup_socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
# This option isn't available in the OS X version of eventlet
if hasattr(socket, 'TCP_KEEPIDLE') and self.keepidle is not None:
if self.keepidle is not None:
dup_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE,
self.keepidle)

14
keystone/tests/test_wsgi.py

@ -415,15 +415,11 @@ class ServerTest(tests.TestCase):
keepidle=1)
server.start()
# keepidle isn't available in the OS X version of eventlet
if hasattr(socket, 'TCP_KEEPIDLE'):
self.assertEqual(mock_sock_dup.setsockopt.call_count, 2)
self.assertEqual(mock_sock_dup.setsockopt.call_count, 2)
# Test the last set of call args i.e. for the keepidle
mock_sock_dup.setsockopt.assert_called_with(socket.IPPROTO_TCP,
socket.TCP_KEEPIDLE,
1)
else:
self.assertEqual(mock_sock_dup.setsockopt.call_count, 1)
# Test the last set of call args i.e. for the keepidle
mock_sock_dup.setsockopt.assert_called_with(socket.IPPROTO_TCP,
socket.TCP_KEEPIDLE,
1)
self.assertTrue(mock_listen.called)

5
tox.ini

@ -76,10 +76,7 @@ commands =
# the check and gate queues
bashate examples/pki/gen_pki.sh
# Check that .po and .pot files are valid.
# NOTE(jaegerandi): We search for files ending with '.po' or '.pot'.
# The regex '.*\.pot?' does not work on OS X and we assume there are no
# files with more than one "t" that have to be ignored.
bash -c "find keystone -type f -regex '.*\.pot*' -print0| \
bash -c "find keystone -type f -regex '.*\.pot?' -print0| \
xargs -0 -n 1 msgfmt --check-format -o /dev/null"
[tox:jenkins]