diff --git a/.gitignore b/.gitignore index f22580b..3114356 100644 --- a/.gitignore +++ b/.gitignore @@ -58,4 +58,4 @@ ChangeLog releasenotes/build /clouds.yaml /*.dat -/playbook.yml +/*.yml diff --git a/aerostat/app.py b/aerostat/app.py index 37ffc55..c054f06 100644 --- a/aerostat/app.py +++ b/aerostat/app.py @@ -27,6 +27,7 @@ import yaml from aerostat import download from aerostat import resolver +from aerostat import resources def main(): @@ -52,28 +53,32 @@ def main(): cloud = shade.OpenStackCloud(cloud_config=cloud_config) downloader = download.Downloader(output_path, cloud) res = resolver.Resolver(cloud, downloader) - tasks = [] - # FIXME(dhellmann): We want the list of things to download to be - # part of the inputs to the program, but for now let's just grab - # all servers and private images.. + # Export independent resources. The resolver handles dependencies + # automatically. + to_export = resources.load(args.resource_file) - for server in cloud.list_servers(): - tasks.extend(res.server(server)) - - for image in cloud.list_images(): - if image.visibility != 'private': - continue + for image_info in to_export.images: + image = cloud.get_image(image_info.name) tasks.extend(res.image(image)) + for volume_info in to_export.volumes: + volume = cloud.get_volume(volume_info.name) + tasks.extend(res.volume(volume)) + + for server_info in to_export.servers: + server = cloud.get_server(server_info.name) + tasks.extend(res.server(server)) + playbook = [ + # The default playbook is configured to run instructions + # locally to talk to the cloud API. {'hosts': 'localhost', 'connection': 'local', 'tasks': tasks, }, ] - playbook_filename = os.path.join(output_path, 'playbook.yml') with open(playbook_filename, 'w', encoding='utf-8') as fd: yaml.dump(playbook, fd, default_flow_style=False, explicit_start=True) diff --git a/aerostat/resources.py b/aerostat/resources.py new file mode 100644 index 0000000..123e71d --- /dev/null +++ b/aerostat/resources.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- + +# Copyright 2010-2011 OpenStack Foundation +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import munch + + +def load(filename): + "Read the file and return the parsed data in a consistent format." + + to_return = munch.Munch( + servers=[], + volumes=[], + images=[], + ) + + with open(filename, 'r', encoding='utf-8') as fd: + contents = munch.Munch.fromYAML(fd.read()) + + to_return.update(contents) + return to_return