contrib: PEP8 compliancy (#24680)

- Make PEP8 compliant
pull/24865/merge
Dag Wieers 7 years ago committed by John R Barker
parent 16c2207d21
commit 758cfeb73e

@ -4,6 +4,7 @@ import argparse
from ipalib import api
import json
def initialize():
'''
This function initializes the FreeIPA/IPA API. This function requires
@ -21,6 +22,7 @@ def initialize():
return api
def list_groups(api):
'''
This function prints a list of all host groups. This function requires
@ -51,6 +53,7 @@ def list_groups(api):
return None
def parse_args():
'''
This function parses the arguments that were passed in via the command line.
@ -66,6 +69,7 @@ def parse_args():
return parser.parse_args()
def print_host(host):
'''
This function is really a stub, it could return variables to be used in
@ -79,6 +83,7 @@ def print_host(host):
return None
if __name__ == '__main__':
args = parse_args()

@ -1,20 +1,21 @@
#!/usr/bin/env python
import argparse
import json
import requests
import os
import argparse
import requests
import types
RACKHD_URL = 'http://localhost:8080'
class RackhdInventory(object):
def __init__(self, nodeids):
self._inventory = {}
for nodeid in nodeids:
self._load_inventory_data(nodeid)
inventory = {}
for nodeid,info in self._inventory.items():
for (nodeid, info) in self._inventory.items():
inventory[nodeid] = (self._format_output(nodeid, info))
print(json.dumps(inventory))
@ -24,7 +25,7 @@ class RackhdInventory(object):
info['lookup'] = RACKHD_URL + '/api/common/lookups/?q={0}'.format(nodeid)
results = {}
for key,url in info.items():
for (key, url) in info.items():
r = requests.get(url, verify=False)
results[key] = r.text
self._inventory[nodeid] = results
@ -36,7 +37,7 @@ class RackhdInventory(object):
if len(node_info) > 0:
ipaddress = node_info[0]['ipAddress']
output = {'hosts': [ipaddress], 'vars': {}}
for key,result in info.items():
for (key, result) in info.items():
output['vars'][key] = json.loads(result)
output['vars']['ansible_ssh_user'] = 'monorail'
except KeyError:

@ -426,7 +426,7 @@ class VMWareInventory(object):
# Reset the inventory keys
for k, v in name_mapping.items():
if not host_mapping or not k in host_mapping:
if not host_mapping or k not in host_mapping:
continue
# set ansible_host (2.x)
@ -742,5 +742,3 @@ class VMWareInventory(object):
if __name__ == "__main__":
# Run the script
print(VMWareInventory().show())

@ -1,6 +1,3 @@
contrib/inventory/freeipa.py
contrib/inventory/rackhd.py
contrib/inventory/vmware_inventory.py
lib/ansible/cli/__init__.py
lib/ansible/cli/adhoc.py
lib/ansible/cli/console.py

Loading…
Cancel
Save