Commit dc63bbf0 by Marc Abramowitz

Simplify serf inventory plugin

using newly added `EnvironmentConfig` class in `serfclient`.

See https://github.com/KushalP/serfclient-py/pull/17
parent ce42c66e
......@@ -35,7 +35,7 @@ import os
import sys
# https://pypi.python.org/pypi/serfclient
from serfclient.client import SerfClient
from serfclient import SerfClient, EnvironmentConfig
try:
import json
......@@ -46,17 +46,8 @@ _key = 'serf'
def _serf_client():
kwargs = {}
rpc_addr = os.getenv('SERF_RPC_ADDR')
if rpc_addr:
kwargs['host'], kwargs['port'] = rpc_addr.split(':')
rpc_auth = os.getenv('SERF_RPC_AUTH')
if rpc_auth:
kwargs['rpc_auth'] = rpc_auth
return SerfClient(**kwargs)
env = EnvironmentConfig()
return SerfClient(host=env.host, port=env.port, rpc_auth=env.auth_key)
def get_serf_members_data():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment