Handle service ports + other fixes.

Handle service ports + other fixes.

Open/close the redis ports.
Add the timeout, tcp-keepalive and databases options.
Make the Redis service listen on the unit private address.
Install charmhelpers from a local tarball rather than PyPI.

QA: make ftest

https://code.launchpad.net/~frankban/charms/trusty/redis/handle-ports/+merge/260168

(do not edit description out of merge proposal)

[frankban, 2015-05-26 14:11:55]

Please take a look.

[martin.hilton, 2015-05-26 14:23:30]

LGTM

https://codereview.appspot.com/243730043/diff/1/hooks/relations.py
File hooks/relations.py (right):

https://codereview.appspot.com/243730043/diff/1/hooks/relations.py#newcode25
hooks/relations.py:25: 'hostname': hookenv.unit_private_ip(),
so you did want private ips?

[jay.wren, 2015-05-26 15:18:02]

LGTM. One item I think could be simplified. Take it or leave it.

https://codereview.appspot.com/243730043/diff/1/hooks/hookutils.py
File hooks/hookutils.py (right):

https://codereview.appspot.com/243730043/diff/1/hooks/hookutils.py#newcode12
hooks/hookutils.py:12: log = functools.partial(hookenv.log, level=hookenv.INFO)
This should not be necessary. log = hookenv.log should be enough. From the docs
here https://jujucharms.com/docs/stable/authors-hook-environment INFO is the
default level. The hookenv.log implementation does not pass a log level if none
is specified and thus defaults to INFO.

[jay.wren, 2015-05-26 17:12:15]

make ftest fails

$ make ftest
juju bootstrap -e local --upload-tools
Bootstrapping environment "local"
Starting new instance for initial state server
Building tools to upload (1.23.3.1-vivid-amd64)
Installing Juju agent on bootstrap instance
Logging to /home/jrwren/.juju/local/cloud-init-output.log on remote host
Bootstrapping Juju machine agent
Starting Juju machine agent (juju-agent-jrwren-local)
Bootstrap complete
juju status -e local
environment: local
machines:
  "0":
    agent-state: pending
    dns-name: localhost
    instance-id: localhost
    series: vivid
    state-server-member-status: has-vote
services: {}
PATH=".venv/bin:/home/jrwren/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/share/npm/bin"
.venv/bin/nosetests --verbosity 2 -s -x tests/test_10_deploy.py
2015-05-26 13:04:48 Starting deployment of local
2015-05-26 13:04:49 Deploying services...
2015-05-26 13:04:49  Deploying service redis0 using local:trusty/redis
2015-05-26 13:07:51 The following units had errors:
   unit: redis0/0: machine: 1 agent-state: error details: hook failed: "install"
2015-05-26 13:07:51 Deployment stopped. run time: 182.91
ERROR

======================================================================
ERROR: test suite for <class 'test_10_deploy.TestDeployment'>
----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 209, in run
    self.setUp()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 292, in setUp
    self.setupContext(ancestor)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 315, in setupContext
    try_run(context, names)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/util.py",
line 471, in try_run
    return func()
  File "/home/jrwren/redis-handle-ports/tests/test_10_deploy.py", line 40, in
setUpClass
    cls.deployment, cls.unit = helpers.deploy()
  File "/home/jrwren/redis-handle-ports/tests/helpers.py", line 91, in deploy
    deployment.setup(timeout=_TIMEOUT)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/amulet/deployer.py",
line 351, in setup
    subprocess.check_call(shlex.split(cmd))
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c',
'/tmp/amulet-juju-deployer-1JHKoW/deployer-schema.json', '-e', 'local', '-t',
'1900', 'local']' returned non-zero exit status 1
-------------------- >> begin captured logging << --------------------
amulet.deployer: DEBUG: Deployer schema
{
  "local": {
    "services": {
      "redis0": {
        "expose": true, 
        "num_units": 1, 
        "branch": "/home/jrwren/redis-handle-ports"
      }
    }, 
    "series": "trusty", 
    "relations": []
  }
}
amulet.deployer: DEBUG: juju-deployer -W -L -c
/tmp/amulet-juju-deployer-1JHKoW/deployer-schema.json -e local -t 1900 local
--------------------- >> end captured logging << ---------------------

----------------------------------------------------------------------
Ran 0 tests in 183.158s

FAILED (errors=1)
Makefile:87: recipe for target 'ftest' failed
make: *** [ftest] Error 1

https://codereview.appspot.com/243730043/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/243730043/diff/1/Makefile#newcode14
Makefile:14: SYSDEPS = charm-tools juju-core juju-local python-dev python-pip \
amulet depends on juju-deployer. Please add juju-deployer to sysdeps.

https://codereview.appspot.com/243730043/diff/1/Makefile#newcode86
Makefile:86: ftest:
It would be nice if this depended on $(VENV_ACTIVATE).

https://codereview.appspot.com/243730043/diff/1/Makefile#newcode92
Makefile:92: PATH="$(VENV)/bin:$(PATH)" $(NOSE) --verbosity 2 -s -x $(FTESTS)
This uses the current juju environment even though a local was just created.

Maybe juju switch $(JUJU_ENV) before running this?

[frankban, 2015-05-27 08:08:01]

Please take a look.

https://codereview.appspot.com/243730043/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/243730043/diff/1/Makefile#newcode14
Makefile:14: SYSDEPS = charm-tools juju-core juju-local python-dev python-pip \
On 2015/05/26 17:12:14, jay.wren wrote:
> amulet depends on juju-deployer. Please add juju-deployer to sysdeps.

Both amulet and juju deployer are installed in the virtual env (see
test-requirements.pip), so there is no need add them as system packages.

https://codereview.appspot.com/243730043/diff/1/Makefile#newcode86
Makefile:86: ftest:
On 2015/05/26 17:12:15, jay.wren wrote:
> It would be nice if this depended on $(VENV_ACTIVATE).

Indeed, it should depend on setup. Done good catch.

https://codereview.appspot.com/243730043/diff/1/Makefile#newcode92
Makefile:92: PATH="$(VENV)/bin:$(PATH)" $(NOSE) --verbosity 2 -s -x $(FTESTS)
On 2015/05/26 17:12:15, jay.wren wrote:
> This uses the current juju environment even though a local was just created.
> 
> Maybe juju switch $(JUJU_ENV) before running this?

I am confused. AFAICT a local repository is created, and then the environment
used for tests is the default one or the JUJU_ENV one.

[frankban, 2015-05-27 08:09:54]

On 2015/05/26 17:12:15, jay.wren wrote:
> make ftest fails

This is weird because it wfm.
It would be nice to have the install hook logs to see why it failed.
A possible reason that i've found is not running apt-get update before
installing deb packages.
I updated the charm to do that, could you please try it again?

Thanks for the QA!

[jay.wren, 2015-05-27 13:41:59]

On 2015/05/27 08:09:54, frankban wrote:
> On 2015/05/26 17:12:15, jay.wren wrote:
> > make ftest fails
> 
> This is weird because it wfm.
> It would be nice to have the install hook logs to see why it failed.
> A possible reason that i've found is not running apt-get update before
> installing deb packages.
> I updated the charm to do that, could you please try it again?
> 
> Thanks for the QA!

Same results running make ftest. amulet uses current juju env, seems to ignire
JUJU_ENV 

$ make ftestjuju bootstrap -e local --upload-tools
Bootstrapping environment "local"
Starting new instance for initial state server
Building tools to upload (1.23.3.1-vivid-amd64)
Installing Juju agent on bootstrap instance
Logging to /home/jrwren/.juju/local/cloud-init-output.log on remote host
Bootstrapping Juju machine agent
Starting Juju machine agent (juju-agent-jrwren-local)
Bootstrap complete
juju status -e local
environment: local
machines:
  "0":
    agent-state: pending
    dns-name: localhost
    instance-id: localhost
    series: vivid
    state-server-member-status: has-vote
services: {}
PATH=".venv/bin:/home/jrwren/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/share/npm/bin"
.venv/bin/nosetests --verbosity 2 -s -x tests/test_10_deploy.py
2015-05-27 09:39:41 Starting deployment of azure
2015-05-27 09:39:41 Error getting env api endpoints, env bootstrapped?
2015-05-27 09:39:41 Command (juju api-endpoints -e azure) Output:

 
2015-05-27 09:39:41 Deployment stopped. run time: 0.39
ERROR

======================================================================
ERROR: test suite for <class 'test_10_deploy.TestDeployment'>
----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 209, in run
    self.setUp()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 292, in setUp
    self.setupContext(ancestor)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 315, in setupContext
    try_run(context, names)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/util.py",
line 471, in try_run
    return func()
  File "/home/jrwren/redis-handle-ports/tests/test_10_deploy.py", line 40, in
setUpClass
    cls.deployment, cls.unit = helpers.deploy()
  File "/home/jrwren/redis-handle-ports/tests/helpers.py", line 91, in deploy
    deployment.setup(timeout=_TIMEOUT)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/amulet/deployer.py",
line 351, in setup
    subprocess.check_call(shlex.split(cmd))
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c',
'/tmp/amulet-juju-deployer-BmcD8Y/deployer-schema.json', '-e', 'azure', '-t',
'1900', 'azure']' returned non-zero exit status 1
-------------------- >> begin captured logging << --------------------
amulet.deployer: DEBUG: Deployer schema
{
  "azure": {
    "services": {
      "redis0": {
        "expose": true, 
        "num_units": 1, 
        "branch": "/home/jrwren/redis-handle-ports"
      }
    }, 
    "series": "trusty", 
    "relations": []
  }
}
amulet.deployer: DEBUG: juju-deployer -W -L -c
/tmp/amulet-juju-deployer-BmcD8Y/deployer-schema.json -e azure -t 1900 azure
--------------------- >> end captured logging << ---------------------

----------------------------------------------------------------------
Ran 0 tests in 0.599s

FAILED (errors=1)
Makefile:87: recipe for target 'ftest' failed
make: *** [ftest] Error 1

[jay.wren, 2015-05-27 14:55:19]

Amulet does not seem to cleanup after itself or update its JUJU_REPOSITORY. I
removed trusty directory and tried again. Now the install step completes

I get this:

$ make ftestjuju bootstrap -e local --upload-tools
Bootstrapping environment "local"
Starting new instance for initial state server
Building tools to upload (1.23.3.1-vivid-amd64)
Installing Juju agent on bootstrap instance
Logging to /home/jrwren/.juju/local/cloud-init-output.log on remote host
Bootstrapping Juju machine agent
Starting Juju machine agent (juju-agent-jrwren-local)
Bootstrap complete
juju status -e local
environment: local
machines:
  "0":
    agent-state: pending
    dns-name: localhost
    instance-id: localhost
    series: vivid
    state-server-member-status: has-vote
services: {}
PATH=".venv/bin:/home/jrwren/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/share/npm/bin"
.venv/bin/nosetests --verbosity 2 -s -x tests/test_10_deploy.py
2015-05-27 10:47:17 Starting deployment of local
2015-05-27 10:47:18 Deploying services...
2015-05-27 10:47:18  Deploying service redis0 using local:trusty/redis
2015-05-27 10:48:40 Adding relations...
2015-05-27 10:48:40  Exposing service 'redis0'
2015-05-27 10:48:40 Deployment complete in 83.63 seconds
test_config_file (test_10_deploy.TestDeployment) ... ok
test_connection (test_10_deploy.TestDeployment) ... ok
2015-05-27 10:48:57 Starting deployment of local
2015-05-27 10:48:58 Deploying services...
2015-05-27 10:48:58  Deploying service redis1 using local:trusty/redis
Traceback (most recent call last):
  File ".venv/bin/juju-deployer", line 9, in <module>
    load_entry_point('juju-deployer==0.4.3', 'console_scripts',
'juju-deployer')()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/cli.py",
line 130, in main
    run()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/cli.py",
line 228, in run
    importer.Importer(env, deployment, options).run()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/action/importer.py",
line 206, in run
    self.wait_for_units(ignore_errors=ignore_errors)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/action/importer.py",
line 181, in wait_for_units
    services=self.deployment.get_service_names(), on_errors=on_errors)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/env/go.py",
line 227, in wait_for_units
    services=services, on_errors=on_errors).run(callback)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
line 1918, in run
    for change_set in self.watch:
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
line 404, in next
    return super(TimeoutWatcher, self).next()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
line 346, in next
    'Id': self.watcher_id})
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
line 273, in _rpc
    raw = self.conn.recv()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
line 348, in recv
    opcode, data = self.recv_data()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
line 365, in recv_data
    opcode, frame = self.recv_data_frame(control_frame)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
line 378, in recv_data_frame
    frame = self.recv_frame()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
line 410, in recv_frame
    return self.frame_buffer.recv_frame()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_abnf.py",
line 300, in recv_frame
    self.recv_header()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_abnf.py",
line 249, in recv_header
    header = self.recv_strict(2)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_abnf.py",
line 334, in recv_strict
    bytes = self.recv(min(16384, shortage))
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
line 476, in _recv
    return recv(self.sock, bufsize)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_socket.py",
line 89, in recv
    raise WebSocketConnectionClosedException("Connection is already closed.")
websocket._exceptions.WebSocketConnectionClosedException: Connection is already
closed.
ERROR

======================================================================
ERROR: test suite for <class 'test_10_deploy.TestDeploymentOptions'>
----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 209, in run
    self.setUp()
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 292, in setUp
    self.setupContext(ancestor)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
line 315, in setupContext
    try_run(context, names)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/util.py",
line 471, in try_run
    return func()
  File "/home/jrwren/redis-handle-ports/tests/test_10_deploy.py", line 86, in
setUpClass
    cls.deployment, cls.unit = helpers.deploy(options=cls.options)
  File "/home/jrwren/redis-handle-ports/tests/helpers.py", line 91, in deploy
    deployment.setup(timeout=_TIMEOUT)
  File
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/amulet/deployer.py",
line 351, in setup
    subprocess.check_call(shlex.split(cmd))
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c',
'/tmp/amulet-juju-deployer-9CYOZQ/deployer-schema.json', '-e', 'local', '-t',
'1900', 'local']' returned non-zero exit status 1
-------------------- >> begin captured logging << --------------------
amulet.deployer: DEBUG: Deployer schema
{
  "local": {
    "services": {
      "redis1": {
        "expose": true, 
        "num_units": 1, 
        "branch": "/home/jrwren/redis-handle-ports", 
        "options": {
          "password": "secret", 
          "loglevel": "verbose", 
          "timeout": 60, 
          "databases": 3, 
          "logfile": "/tmp/redis.log", 
          "port": 4242
        }
      }
    }, 
    "series": "trusty", 
    "relations": []
  }
}
amulet.deployer: DEBUG: juju-deployer -W -L -c
/tmp/amulet-juju-deployer-9CYOZQ/deployer-schema.json -e local -t 1900 local
--------------------- >> end captured logging << ---------------------

----------------------------------------------------------------------
Ran 2 tests in 112.820s

FAILED (errors=1)
Makefile:87: recipe for target 'ftest' failed
make: *** [ftest] Error 1

[jay.wren, 2015-05-27 15:33:03]

On 2015/05/27 14:55:19, jay.wren wrote:
> Amulet does not seem to cleanup after itself or update its JUJU_REPOSITORY. I
> removed trusty directory and tried again. Now the install step completes
> 
> I get this:
> 
> $ make ftestjuju bootstrap -e local --upload-tools
> Bootstrapping environment "local"
> Starting new instance for initial state server
> Building tools to upload (1.23.3.1-vivid-amd64)
> Installing Juju agent on bootstrap instance
> Logging to /home/jrwren/.juju/local/cloud-init-output.log on remote host
> Bootstrapping Juju machine agent
> Starting Juju machine agent (juju-agent-jrwren-local)
> Bootstrap complete
> juju status -e local
> environment: local
> machines:
>   "0":
>     agent-state: pending
>     dns-name: localhost
>     instance-id: localhost
>     series: vivid
>     state-server-member-status: has-vote
> services: {}
>
PATH=".venv/bin:/home/jrwren/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/local/share/npm/bin"
> .venv/bin/nosetests --verbosity 2 -s -x tests/test_10_deploy.py
> 2015-05-27 10:47:17 Starting deployment of local
> 2015-05-27 10:47:18 Deploying services...
> 2015-05-27 10:47:18  Deploying service redis0 using local:trusty/redis
> 2015-05-27 10:48:40 Adding relations...
> 2015-05-27 10:48:40  Exposing service 'redis0'
> 2015-05-27 10:48:40 Deployment complete in 83.63 seconds
> test_config_file (test_10_deploy.TestDeployment) ... ok
> test_connection (test_10_deploy.TestDeployment) ... ok
> 2015-05-27 10:48:57 Starting deployment of local
> 2015-05-27 10:48:58 Deploying services...
> 2015-05-27 10:48:58  Deploying service redis1 using local:trusty/redis
> Traceback (most recent call last):
>   File ".venv/bin/juju-deployer", line 9, in <module>
>     load_entry_point('juju-deployer==0.4.3', 'console_scripts',
> 'juju-deployer')()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/cli.py",
> line 130, in main
>     run()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/cli.py",
> line 228, in run
>     importer.Importer(env, deployment, options).run()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/action/importer.py",
> line 206, in run
>     self.wait_for_units(ignore_errors=ignore_errors)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/action/importer.py",
> line 181, in wait_for_units
>     services=self.deployment.get_service_names(), on_errors=on_errors)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/deployer/env/go.py",
> line 227, in wait_for_units
>     services=services, on_errors=on_errors).run(callback)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
> line 1918, in run
>     for change_set in self.watch:
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
> line 404, in next
>     return super(TimeoutWatcher, self).next()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
> line 346, in next
>     'Id': self.watcher_id})
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/jujuclient.py",
> line 273, in _rpc
>     raw = self.conn.recv()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
> line 348, in recv
>     opcode, data = self.recv_data()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
> line 365, in recv_data
>     opcode, frame = self.recv_data_frame(control_frame)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
> line 378, in recv_data_frame
>     frame = self.recv_frame()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
> line 410, in recv_frame
>     return self.frame_buffer.recv_frame()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_abnf.py",
> line 300, in recv_frame
>     self.recv_header()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_abnf.py",
> line 249, in recv_header
>     header = self.recv_strict(2)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_abnf.py",
> line 334, in recv_strict
>     bytes = self.recv(min(16384, shortage))
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_core.py",
> line 476, in _recv
>     return recv(self.sock, bufsize)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/websocket/_socket.py",
> line 89, in recv
>     raise WebSocketConnectionClosedException("Connection is already closed.")
> websocket._exceptions.WebSocketConnectionClosedException: Connection is
already
> closed.
> ERROR
> 
> ======================================================================
> ERROR: test suite for <class 'test_10_deploy.TestDeploymentOptions'>
> ----------------------------------------------------------------------
> Traceback (most recent call last):
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
> line 209, in run
>     self.setUp()
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
> line 292, in setUp
>     self.setupContext(ancestor)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/suite.py",
> line 315, in setupContext
>     try_run(context, names)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/nose/util.py",
> line 471, in try_run
>     return func()
>   File "/home/jrwren/redis-handle-ports/tests/test_10_deploy.py", line 86, in
> setUpClass
>     cls.deployment, cls.unit = helpers.deploy(options=cls.options)
>   File "/home/jrwren/redis-handle-ports/tests/helpers.py", line 91, in deploy
>     deployment.setup(timeout=_TIMEOUT)
>   File
>
"/home/jrwren/redis-handle-ports/.venv/local/lib/python2.7/site-packages/amulet/deployer.py",
> line 351, in setup
>     subprocess.check_call(shlex.split(cmd))
>   File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
>     raise CalledProcessError(retcode, cmd)
> CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c',
> '/tmp/amulet-juju-deployer-9CYOZQ/deployer-schema.json', '-e', 'local', '-t',
> '1900', 'local']' returned non-zero exit status 1
> -------------------- >> begin captured logging << --------------------
> amulet.deployer: DEBUG: Deployer schema
> {
>   "local": {
>     "services": {
>       "redis1": {
>         "expose": true, 
>         "num_units": 1, 
>         "branch": "/home/jrwren/redis-handle-ports", 
>         "options": {
>           "password": "secret", 
>           "loglevel": "verbose", 
>           "timeout": 60, 
>           "databases": 3, 
>           "logfile": "/tmp/redis.log", 
>           "port": 4242
>         }
>       }
>     }, 
>     "series": "trusty", 
>     "relations": []
>   }
> }
> amulet.deployer: DEBUG: juju-deployer -W -L -c
> /tmp/amulet-juju-deployer-9CYOZQ/deployer-schema.json -e local -t 1900 local
> --------------------- >> end captured logging << ---------------------
> 
> ----------------------------------------------------------------------
> Ran 2 tests in 112.820s
> 
> FAILED (errors=1)
> Makefile:87: recipe for target 'ftest' failed
> make: *** [ftest] Error 1

upgrade from 1.23.3-vivid-amd64 to 1.24-beta5-vivid-amd64 and it works.

[frankban, 2015-05-27 15:47:09]

*** Submitted:

Handle service ports + other fixes.

Open/close the redis ports.
Add the timeout, tcp-keepalive and databases options.
Make the Redis service listen on the unit private address.
Install charmhelpers from a local tarball rather than PyPI.

QA: make ftest

R=martin.hilton, jay.wren
CC=
https://codereview.appspot.com/243730043

[frankban, 2015-05-27 15:50:21]

Thanks for the reviews!