Skip to content

Commit 79e3b06

Browse files
author
Tom Whitwell
committed
[MOD] Small changes based on Pylint output
1 parent 2a97436 commit 79e3b06

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

memset

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
'''
2+
"""
33
Replace your /etc/ansible/hosts (/usr/local/etc/ansible/hosts) file with this,
44
to automatically import all your Memset servers into the Ansible inventory.
55
@@ -18,7 +18,8 @@ ansible memset-reading -l memset-linux -m ping
1818
1919
API key must have access to at least:
2020
method:server.list, method:server.info & method:service.info
21-
'''
21+
"""
22+
2223
from jsonrpclib import Server
2324
import os
2425
import sys
@@ -40,18 +41,23 @@ uri = "https://%s:@api.memset.com/v1/jsonrpc/" % memkey
4041

4142
s = Server(uri)
4243

44+
4345
def _get_servers():
4446
return s.server.list()
4547

48+
4649
def _get_service(name):
4750
return s.service.info(name=name)
4851

52+
4953
def _simple_os(server):
5054
return 'windows' if server["os"].startswith("win") else 'linux'
5155

56+
5257
def _get_zone(service):
5358
return service['network_zones'][0]
5459

60+
5561
def _build_vars(server):
5662
var = {}
5763
service = _get_service(server["name"])
@@ -81,6 +87,7 @@ def _build_vars(server):
8187

8288
return var
8389

90+
8491
def get_single(hostname):
8592
servers = _get_servers()
8693
server = filter(lambda s: s["host_name"] == hostname, servers)
@@ -89,16 +96,17 @@ def get_single(hostname):
8996
output = _build_vars(server[0])
9097
return output
9198

99+
92100
def get_all():
93101
osses = {}
94102
osses["windows"] = []
95103
osses["linux"] = []
96104
output = {
97-
'memset-windows' : {'hosts' : [], 'vars': {}},
98-
'memset-linux' : {'hosts' : [], 'vars': {}},
99-
'memset-reading' : {'hosts' : [], 'vars': {}},
100-
'memset-dunsfold' : {'hosts' : [], 'vars': {}},
101-
'_meta' : {'hostvars': {}}
105+
'memset-windows': {'hosts': [], 'vars': {}},
106+
'memset-linux': {'hosts': [], 'vars': {}},
107+
'memset-reading': {'hosts': [], 'vars': {}},
108+
'memset-dunsfold': {'hosts': [], 'vars': {}},
109+
'_meta': {'hostvars': {}}
102110
}
103111
for server in _get_servers():
104112
os_group = 'memset-%s' % _simple_os(server)
@@ -111,6 +119,7 @@ def get_all():
111119
output['memset-linux']['vars']["ansible_ssh_user"] = 'root'
112120
return output
113121

122+
114123
def main():
115124
try:
116125
opts, args = getopt.getopt(sys.argv[1:], "", ["list", "host="])
@@ -125,5 +134,6 @@ def main():
125134
output = get_single(a)
126135
print json.dumps(output, sort_keys=True, indent=4, separators=(',', ': '))
127136

137+
128138
if __name__ == '__main__':
129139
main()

0 commit comments

Comments
 (0)