From eb788dd8f62a574f9df8a74b472094e4e28a778e Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 31 Mar 2015 12:50:47 -0700 Subject: [PATCH] Just move things around so that new_inventory doesn't interfere with testing --- v2/ansible/new_inventory/__init__.py | 4 ++-- v2/ansible/{new_inventory => plugins/inventory}/aggregate.py | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename v2/ansible/{new_inventory => plugins/inventory}/aggregate.py (100%) diff --git a/v2/ansible/new_inventory/__init__.py b/v2/ansible/new_inventory/__init__.py index bcf87c9ef87..b91d9f05a28 100644 --- a/v2/ansible/new_inventory/__init__.py +++ b/v2/ansible/new_inventory/__init__.py @@ -23,8 +23,8 @@ __metaclass__ = type from ansible import constants as C from ansible.inventory.group import Group -from ansible.inventory.host import Host -from ansible.inventory.aggregate import InventoryAggregateParser +from .host import Host +from ansible.plugins.inventory.aggregate import InventoryAggregateParser class Inventory: ''' diff --git a/v2/ansible/new_inventory/aggregate.py b/v2/ansible/plugins/inventory/aggregate.py similarity index 100% rename from v2/ansible/new_inventory/aggregate.py rename to v2/ansible/plugins/inventory/aggregate.py