From 38f86ec17bc0711191ba260a5c39580612972360 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 24 Mar 2015 17:06:19 +0000 Subject: [PATCH] Revert "add image_id_to_name filter" This reverts commit b4be4fe3d294ee017c1e087396bfe89bf78f36c6. --- filter_plugins/openstack.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/filter_plugins/openstack.py b/filter_plugins/openstack.py index 43073f5d63..69266b4971 100644 --- a/filter_plugins/openstack.py +++ b/filter_plugins/openstack.py @@ -1,11 +1,7 @@ from ansible import errors, runner -from glanceclient import Client as GlanceClient -from keystoneclient import session -from keystoneclient.auth.identity import v2 as identity -from novaclient.v3.client import Client -import glanceclient.exc import json -import novaclient.exceptions +from novaclient.v3.client import Client +import novaclient.exceptions; def flavor_id_to_name(host_vars, user, password, tenant, auth_url): nt = Client(user, password, tenant, auth_url, service_type="compute") @@ -23,21 +19,8 @@ def flavor_name_to_id(host_vars, user, password, tenant, auth_url): return i.id raise errors.AnsibleFilterError('There is no flavor of id {0}'.format(host_vars)) -def image_id_to_name(host_vars, user, password, tenant, auth_url): - auth = identity.Password(auth_url=auth_url, username=user, - password=password, tenant_name=tenant) - sess = session.Session(auth=auth) - token = auth.get_token(sess) - endpoint = auth.get_endpoint(sess, service_name='glance', service_type='image') - glance = GlanceClient('2', endpoint=endpoint, token=token) - try: - return glance.images.get(host_vars).name - except glanceclient.exc.HTTPNotFound: - raise errors.AnsibleFilterError('There is no image of id {0}'.format(host_vars)) - class FilterModule (object): def filters(self): return {"flavor_id_to_name": flavor_id_to_name, "flavor_name_to_id": flavor_name_to_id, - "image_id_to_name": image_id_to_name, }