commit | b9d9f6f7cc3b56a8465e2ee47a024ce5f528925a | [log] [tgz] |
---|---|---|
author | Zack Williams <zdw@artisancomputer.com> | Wed Apr 27 11:59:40 2016 -0700 |
committer | Zack Williams <zdw@artisancomputer.com> | Wed Apr 27 11:59:40 2016 -0700 |
tree | c84c286914592fbb0842c321163c9ba06161ac90 | |
parent | ed79761fa911f03e648de6bcfce01fd9e7490ca7 [diff] |
rename openstack due to module name conflict with upstream
diff --git a/xos/openstack/__init__.py b/xos/openstack_xos/__init__.py similarity index 100% rename from xos/openstack/__init__.py rename to xos/openstack_xos/__init__.py
diff --git a/xos/openstack/client.py b/xos/openstack_xos/client.py similarity index 100% rename from xos/openstack/client.py rename to xos/openstack_xos/client.py
diff --git a/xos/openstack/driver.py b/xos/openstack_xos/driver.py similarity index 100% rename from xos/openstack/driver.py rename to xos/openstack_xos/driver.py
diff --git a/xos/openstack/get_token.sh b/xos/openstack_xos/get_token.sh similarity index 100% rename from xos/openstack/get_token.sh rename to xos/openstack_xos/get_token.sh
diff --git a/xos/openstack/instanceagent.py b/xos/openstack_xos/instanceagent.py similarity index 100% rename from xos/openstack/instanceagent.py rename to xos/openstack_xos/instanceagent.py
diff --git a/xos/openstack/manager.py b/xos/openstack_xos/manager.py similarity index 100% rename from xos/openstack/manager.py rename to xos/openstack_xos/manager.py
diff --git a/xos/openstack/reservationagent.py b/xos/openstack_xos/reservationagent.py similarity index 100% rename from xos/openstack/reservationagent.py rename to xos/openstack_xos/reservationagent.py
diff --git a/xos/synchronizers/openstack/event_loop.py b/xos/synchronizers/openstack/event_loop.py index db78f07..6f98e38 100644 --- a/xos/synchronizers/openstack/event_loop.py +++ b/xos/synchronizers/openstack/event_loop.py
@@ -17,8 +17,8 @@ from django.db.models import F, Q from django.db import connection from django.db import reset_queries -#from openstack.manager import OpenStackManager -from openstack.driver import OpenStackDriver +#from openstack_xos.manager import OpenStackManager +from openstack_xos.driver import OpenStackDriver from xos.logger import Logger, logging, logger #from timeout import timeout from xos.config import Config, XOS_DIR