cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update to final shade inventory interface

Browse source 
shade has an inventory interface that is cleaner. We should use it.
This commit is contained in:
Monty Taylor 2015-03-01 11:56:10 -05:00
parent 1280e2296c
commit cac00add8d
1 changed files with 95 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

163
contrib/inventory/openstack.py
View file

@ -2,7 +2,7 @@
# Copyright (c) 2012, Marco Vito Moscaritolo <marco@agavee.com> # Copyright (c) 2012, Marco Vito Moscaritolo <marco@agavee.com>
# Copyright (c) 2013, Jesse Keating <jesse.keating@rackspace.com> # Copyright (c) 2013, Jesse Keating <jesse.keating@rackspace.com>
# Copyright (c) 2014, Hewlett-Packard Development Company, L.P. # Copyright (c) 2015, Hewlett-Packard Development Company, L.P.
# #
# This module is free software: you can redistribute it and/or modify # This module is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -46,89 +46,105 @@ except:
import os_client_config import os_client_config
import shade import shade
import shade.inventory
CONFIG_FILES = ['/etc/ansible/openstack.yaml']
class OpenStackInventory(object): def get_groups_from_server(server_vars):
groups = []
def __init__(self, private=False, refresh=False): region = server_vars['region']
config_files = os_client_config.config.CONFIG_FILES cloud = server_vars['cloud']
config_files.append('/etc/ansible/openstack.yml') metadata = server_vars.get('metadata', {})
self.openstack_config = os_client_config.config.OpenStackConfig(
config_files)
self.clouds = shade.openstack_clouds(self.openstack_config)
self.private = private
self.refresh = refresh
self.cache_max_age = self.openstack_config.get_cache_max_age() # Create a group for the cloud
cache_path = self.openstack_config.get_cache_path() groups.append(cloud)
# Cache related # Create a group on region
if not os.path.exists(cache_path): groups.append(region)
os.makedirs(cache_path)
self.cache_file = os.path.join(cache_path, "ansible-inventory.cache")
def is_cache_stale(self): # And one by cloud_region
''' Determines if cache file has expired, or if it is still valid ''' groups.append("%s_%s" % (cloud, region))
if os.path.isfile(self.cache_file):
mod_time = os.path.getmtime(self.cache_file)
current_time = time.time()
if (mod_time + self.cache_max_age) > current_time:
return False
return True
def get_host_groups(self): # Check if group metadata key in servers' metadata
if self.refresh or self.is_cache_stale(): if 'group' in metadata:
groups = self.get_host_groups_from_cloud() groups.append(metadata['group'])
self.write_cache(groups)
else:
return json.load(open(self.cache_file, 'r'))
return groups
def write_cache(self, groups): for extra_group in metadata.get('groups', '').split(','):
with open(self.cache_file, 'w') as cache_file: if extra_group:
cache_file.write(self.json_format_dict(groups)) groups.append(extra_group)
def get_host_groups_from_cloud(self): groups.append('instance-%s' % server_vars['id'])
groups = collections.defaultdict(list) groups.append(server_vars['name'])
hostvars = collections.defaultdict(dict)
for cloud in self.clouds: for key in ('flavor', 'image'):
cloud.private = cloud.private or self.private if 'name' in server_vars[key]:
groups.append('%s-%s' % (key, server_vars[key]['name']))
# Cycle on servers for key, value in iter(metadata.items()):
for server in cloud.list_servers(): groups.append('meta-%s_%s' % (key, value))
meta = cloud.get_server_meta(server) az = server_vars.get('az', None)
if az:
# Make groups for az, region_az and cloud_region_az
groups.append(az)
groups.append('%s_%s' % (region, az))
groups.append('%s_%s_%s' % (cloud, region, az))
return groups
if 'interface_ip' not in meta['server_vars']:
# skip this host if it doesn't have a network address
continue
server_vars = meta['server_vars'] def get_host_groups(inventory):
hostvars[server.name][ (cache_file, cache_expiration_time) = get_cache_settings()
'ansible_ssh_host'] = server_vars['interface_ip'] if is_cache_stale(cache_file, cache_expiration_time):
hostvars[server.name]['openstack'] = server_vars groups = to_json(get_host_groups_from_cloud(inventory))
open(cache_file, 'w').write(groups)
else:
groups = open(cache_file, 'r').read()
return groups
for group in meta['groups']:
groups[group].append(server.name)
if hostvars: def get_host_groups_from_cloud(inventory):
groups['_meta'] = {'hostvars': hostvars} groups = collections.defaultdict(list)
return groups hostvars = {}
for server in inventory.list_hosts():
def json_format_dict(self, data): if 'interface_ip' not in server:
return json.dumps(data, sort_keys=True, indent=2) continue
for group in get_groups_from_server(server):
groups[group].append(server['id'])
hostvars[server['id']] = dict(
ansible_ssh_host=server['interface_ip'],
openstack=server,
)
groups['_meta'] = {'hostvars': hostvars}
return groups
def list_instances(self):
groups = self.get_host_groups()
# Return server list
print(self.json_format_dict(groups))
def get_host(self, hostname): def is_cache_stale(cache_file, cache_expiration_time):
groups = self.get_host_groups() ''' Determines if cache file has expired, or if it is still valid '''
hostvars = groups['_meta']['hostvars'] if os.path.isfile(cache_file):
if hostname in hostvars: mod_time = os.path.getmtime(cache_file)
print(self.json_format_dict(hostvars[hostname])) current_time = time.time()
if (mod_time + cache_expiration_time) > current_time:
return False
return True
def get_cache_settings():
config = os_client_config.config.OpenStackConfig(
config_files=os_client_config.config.CONFIG_FILES + CONFIG_FILES)
# For inventory-wide caching
cache_expiration_time = config.get_cache_expiration_time()
cache_path = config.get_cache_path()
if not os.path.exists(cache_path):
os.makedirs(cache_path)
cache_file = os.path.join(cache_path, 'ansible-inventory.cache')
return (cache_file, cache_expiration_time)
def to_json(in_dict):
return json.dumps(in_dict, sort_keys=True, indent=2)
def parse_args(): def parse_args():
@ -138,21 +154,32 @@ def parse_args():
help='Use private address for ansible host') help='Use private address for ansible host')
parser.add_argument('--refresh', action='store_true', parser.add_argument('--refresh', action='store_true',
help='Refresh cached information') help='Refresh cached information')
parser.add_argument('--debug', action='store_true', default=False,
help='Enable debug output')
group = parser.add_mutually_exclusive_group(required=True) group = parser.add_mutually_exclusive_group(required=True)
group.add_argument('--list', action='store_true', group.add_argument('--list', action='store_true',
help='List active servers') help='List active servers')
group.add_argument('--host', help='List details about the specific host') group.add_argument('--host', help='List details about the specific host')
return parser.parse_args() return parser.parse_args()
def main(): def main():
args = parse_args() args = parse_args()
try: try:
inventory = OpenStackInventory(args.private, args.refresh) config_files = os_client_config.config.CONFIG_FILES + CONFIG_FILES
shade.simple_logging(debug=args.debug)
inventory = shade.inventory.OpenStackInventory(
refresh=args.refresh,
config_files=config_files,
private=args.private,
)
if args.list: if args.list:
inventory.list_instances() output = get_host_groups(inventory)
elif args.host: elif args.host:
inventory.get_host(args.host) output = to_json(inventory.get_host(args.host))
print(output)
except shade.OpenStackCloudException as e: except shade.OpenStackCloudException as e:
sys.stderr.write('%s\n' % e.message) sys.stderr.write('%s\n' % e.message)
sys.exit(1) sys.exit(1)