internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11297 from msabramo/serf_plugin_use_env_vars

Browse Source 
Simplify serf inventory plugin
This commit is contained in:
Brian Coca
2015-06-17 11:31:57 -04:00
parent 194b85338f dc63bbf0b9
commit 8cfec0a27a
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/inventory/serf.py
View File

@@ -35,7 +35,7 @@ import os
import sys import sys
# https://pypi.python.org/pypi/serfclient # https://pypi.python.org/pypi/serfclient
from serfclient.client import SerfClient from serfclient import SerfClient, EnvironmentConfig
try: try:
import json import json
@@ -46,17 +46,8 @@ _key = 'serf'
def _serf_client(): def _serf_client():
kwargs = {} env = EnvironmentConfig()
return SerfClient(host=env.host, port=env.port, rpc_auth=env.auth_key)
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)
def get_serf_members_data(): def get_serf_members_data():