Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vmware inventory fixes and features #8189

Merged
merged 2 commits into from
Jul 31, 2014
Merged

vmware inventory fixes and features #8189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
900a9f9
added environment variables as config overrides for vmware inventory
bcoca Jul 15, 2014
b65536b
removed parent, wasn't very useful and caused problems across versions
bcoca Jul 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/inventory/vmware.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ guests_only = True
#hw_group =

[cache]
cache_max_age = 3600
cache_dir = /var/tmp
max_age = 3600
dir = ~/.cache/ansible

[auth]
host = vcenter.example.com
Expand Down
104 changes: 52 additions & 52 deletions plugins/inventory/vmware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
so if you don't have clustered vcenter but multiple esx machines or
just diff clusters you can have a inventory per each and automatically
group hosts based on file name or specify a group in the ini.

You can also use <SCRIPT_NAME>_HOST|USER|PASSWORD environment variables
to override the ini.
'''

import os
Expand All @@ -31,44 +34,51 @@

def save_cache(cache_item, data, config):
''' saves item to cache '''
dpath = config.get('defaults', 'cache_dir')
try:
cache = open('/'.join([dpath,cache_item]), 'w')
cache.write(json.dumps(data))
cache.close()
except IOError, e:
pass # not really sure what to do here

if config.has_option('cache', 'dir'):
dpath = os.path.expanduser(config.get('cache', 'dir'))
try:
if not os.path.exists(dpath):
os.makedirs(dpath)
if os.path.isdir(dpath):
cache = open('/'.join([dpath,cache_item]), 'w')
cache.write(json.dumps(data))
cache.close()
except IOError, e:
pass # not really sure what to do here


def get_cache(cache_item, config):
''' returns cached item '''
dpath = config.get('defaults', 'cache_dir')

inv = {}
try:
cache = open('/'.join([dpath,cache_item]), 'r')
inv = json.loads(cache.read())
cache.close()
except IOError, e:
pass # not really sure what to do here
if config.has_option('cache', 'dir'):
dpath = os.path.expanduser(config.get('cache', 'dir'))
try:
cache = open('/'.join([dpath,cache_item]), 'r')
inv = json.loads(cache.read())
cache.close()
except IOError, e:
pass # not really sure what to do here

return inv

def cache_available(cache_item, config):
''' checks if we have a 'fresh' cache available for item requested '''

if config.has_option('defaults', 'cache_dir'):
dpath = config.get('defaults', 'cache_dir')
if config.has_option('cache', 'dir'):
dpath = os.path.expanduser(config.get('cache', 'dir'))

try:
existing = os.stat( '/'.join([dpath,cache_item]))
existing = os.stat('/'.join([dpath,cache_item]))
except:
# cache doesn't exist or isn't accessible
return False

if config.has_option('defaults', 'cache_max_age'):
maxage = config.get('defaults', 'cache_max_age')

if (existing.st_mtime - int(time.time())) <= maxage:
if config.has_option('cache', 'max_age'):
maxage = config.get('cache', 'max_age')
fileage = int( time.time() - existing.st_mtime )
if (maxage > fileage):
return True

return False
Expand All @@ -77,10 +87,8 @@ def get_host_info(host):
''' Get variables about a specific host '''

hostinfo = {
'vmware_name' : host.name,
'vmware_tag' : host.tag,
'vmware_parent': host.parent.name,
}
'vmware_name' : host.name,
}
for k in host.capability.__dict__.keys():
if k.startswith('_'):
continue
Expand All @@ -95,9 +103,11 @@ def get_host_info(host):
def get_inventory(client, config):
''' Reads the inventory from cache or vmware api '''

inv = {}

if cache_available('inventory', config):
inv = get_cache('inventory',config)
else:
elif client:
inv= { 'all': {'hosts': []}, '_meta': { 'hostvars': {} } }
default_group = os.path.basename(sys.argv[0]).rstrip('.py')

Expand Down Expand Up @@ -125,53 +135,40 @@ def get_inventory(client, config):
if not guests_only:
inv['all']['hosts'].append(host.name)
inv[hw_group].append(host.name)
if host.tag:
taggroup = 'vmware_' + host.tag
if taggroup in inv:
inv[taggroup].append(host.name)
else:
inv[taggroup] = [ host.name ]

inv['_meta']['hostvars'][host.name] = get_host_info(host)
save_cache(vm.name, inv['_meta']['hostvars'][host.name], config)

for vm in host.vm:
inv['all']['hosts'].append(vm.name)
inv[vm_group].append(vm.name)
if vm.tag:
taggroup = 'vmware_' + vm.tag
if taggroup in inv:
inv[taggroup].append(vm.name)
else:
inv[taggroup] = [ vm.name ]

inv['_meta']['hostvars'][vm.name] = get_host_info(host)
inv['_meta']['hostvars'][vm.name] = get_host_info(vm)
save_cache(vm.name, inv['_meta']['hostvars'][vm.name], config)

save_cache('inventory', inv, config)
save_cache('inventory', inv, config)

return json.dumps(inv)

def get_single_host(client, config, hostname):

inv = {}

if cache_available(hostname, config):
inv = get_cache(hostname,config)
else:
elif client:
hosts = HostSystem.all(client) #TODO: figure out single host getter
for host in hosts:
if hostname == host.name:
inv = get_host_info(host)
break
for vm in host.vm:
if hostname == vm.name:
inv = get_host_info(host)
inv = get_host_info(vm)
break
save_cache(hostname,inv,config)

return json.dumps(inv)

if __name__ == '__main__':

inventory = {}
hostname = None

Expand All @@ -181,25 +178,28 @@ def get_single_host(client, config, hostname):

# Read config
config = ConfigParser.SafeConfigParser()
for configfilename in [os.path.abspath(sys.argv[0]).rstrip('.py') + '.ini', 'vmware.ini']:
me = os.path.abspath(sys.argv[0]).rstrip('.py')
for configfilename in [me + '.ini', 'vmware.ini']:
if os.path.exists(configfilename):
config.read(configfilename)
break

mename = os.path.basename(me).upper()
host = os.getenv('VMWARE_' + mename + '_HOST',os.getenv('VMWARE_HOST', config.get('auth','host')))
user = os.getenv('VMWARE_' + mename + '_USER', os.getenv('VMWARE_USER', config.get('auth','user')))
password = os.getenv('VMWARE_' + mename + '_PASSWORD',os.getenv('VMWARE_PASSWORD', config.get('auth','password')))

try:
client = Client( config.get('auth','host'),
config.get('auth','user'),
config.get('auth','password'),
)
client = Client( host,user,password )
except Exception, e:
client = None
#print >> STDERR "Unable to login (only cache avilable): %s", str(e)

# acitually do the work
# Actually do the work
if hostname is None:
inventory = get_inventory(client, config)
else:
inventory = get_single_host(client, config, hostname)

# return to ansible
# Return to ansible
print inventory