| commit | a6ffab3b325c937b50ac44474f7f8fb50b15e40c | [log] [tgz] |
|---|---|---|
| author | Scott Baker <smbaker@gmail.com> | Thu Dec 31 11:10:29 2015 -0800 |
| committer | Scott Baker <smbaker@gmail.com> | Thu Dec 31 11:10:29 2015 -0800 |
| tree | 8c6bacb6c81ff6ecad2502980072c3c2c4275dd0 | |
| parent | 11298315a18954945d5e24f9d5eeb653b05f6a98 [diff] |
use Tenant and Service from core instead of ceilometer
diff --git a/xos/ceilometer/__init__.py b/xos/services/ceilometer/__init__.py similarity index 100% rename from xos/ceilometer/__init__.py rename to xos/services/ceilometer/__init__.py
diff --git a/xos/ceilometer/admin.py b/xos/services/ceilometer/admin.py similarity index 100% rename from xos/ceilometer/admin.py rename to xos/services/ceilometer/admin.py
diff --git a/xos/ceilometer/models.py b/xos/services/ceilometer/models.py similarity index 100% rename from xos/ceilometer/models.py rename to xos/services/ceilometer/models.py
diff --git a/xos/ceilometer/templates/ceilometeradmin.html b/xos/services/ceilometer/templates/ceilometeradmin.html similarity index 100% rename from xos/ceilometer/templates/ceilometeradmin.html rename to xos/services/ceilometer/templates/ceilometeradmin.html
diff --git a/xos/tosca/resources/tenant.py b/xos/tosca/resources/tenant.py index 831f6eb..21b8e88 100644 --- a/xos/tosca/resources/tenant.py +++ b/xos/tosca/resources/tenant.py
@@ -7,7 +7,7 @@ from translator.toscalib.tosca_template import ToscaTemplate import pdb -from ceilometer.models import Tenant, Service +from core.models import Tenant, Service from xosresource import XOSResource