From 5312bf970db9172a4dec896bdf6f13c8fd921f91 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 6 Jan 2015 15:08:20 -0500 Subject: [PATCH] fix bugs --- planetstack/core/admin.py | 2 +- planetstack/openstack_observer/steps/__init__.py | 2 +- .../openstack_observer/steps/sync_controller_sites.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 9e9d0c6..b0f0446 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -418,7 +418,7 @@ class ControllerSiteInline(PlStackTabularInline): model = ControllerSite extra = 0 suit_classes = 'suit-tab suit-tab-admin-only' - fields = ['controller', 'site_deployment', 'tenant_id'] + fields = ['controller', 'site', 'tenant_id'] class SitePrivilegeInline(PlStackTabularInline): diff --git a/planetstack/openstack_observer/steps/__init__.py b/planetstack/openstack_observer/steps/__init__.py index 92cc7f2..f164623 100644 --- a/planetstack/openstack_observer/steps/__init__.py +++ b/planetstack/openstack_observer/steps/__init__.py @@ -1 +1 @@ -from .sync_controller_sites import SyncControllerSite +from .sync_controller_sites import SyncControllerSites diff --git a/planetstack/openstack_observer/steps/sync_controller_sites.py b/planetstack/openstack_observer/steps/sync_controller_sites.py index f6425ae..865ae07 100644 --- a/planetstack/openstack_observer/steps/sync_controller_sites.py +++ b/planetstack/openstack_observer/steps/sync_controller_sites.py @@ -2,11 +2,11 @@ import os import base64 from django.db.models import F, Q from planetstack.config import Config -from observer.openstacksyncstep import OpenStackSyncStep +from openstack_observer.openstacksyncstep import OpenStackSyncStep from core.models.site import * from observer.ansible import * -class SyncControllerSite(OpenStackSyncStep): +class SyncControllerSites(OpenStackSyncStep): requested_interval=0 provides=[ControllerSite] @@ -21,7 +21,7 @@ class SyncControllerSite(OpenStackSyncStep): 'admin_user': controller_site.controller.admin_user, 'admin_password': controller_site.controller.admin_password, 'admin_tenant': controller_site.controller.admin_tenant, - 'ansible_tag': '%s@%s'%(controller_site.site.login_base,controller_site.deployment.name), # name of ansible playbook + 'ansible_tag': '%s@%s'%(controller_site.site.login_base,controller_site.controller.name), # name of ansible playbook 'tenant': controller_site.site.login_base, 'tenant_description': controller_site.site.name} -- 2.43.0