git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6288f8
)
fix bugs
author
Tony Mack
<tmack@tux.cs.princeton.edu>
Tue, 6 Jan 2015 20:08:20 +0000
(15:08 -0500)
committer
Tony Mack
<tmack@tux.cs.princeton.edu>
Tue, 6 Jan 2015 20:08:20 +0000
(15:08 -0500)
planetstack/core/admin.py
patch
|
blob
|
history
planetstack/openstack_observer/steps/__init__.py
patch
|
blob
|
history
planetstack/openstack_observer/steps/sync_controller_sites.py
patch
|
blob
|
history
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
9e9d0c6
..
b0f0446
100644
(file)
--- 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'
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):
class SitePrivilegeInline(PlStackTabularInline):
diff --git
a/planetstack/openstack_observer/steps/__init__.py
b/planetstack/openstack_observer/steps/__init__.py
index
92cc7f2
..
f164623
100644
(file)
--- 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 SyncControllerSite
s
diff --git
a/planetstack/openstack_observer/steps/sync_controller_sites.py
b/planetstack/openstack_observer/steps/sync_controller_sites.py
index
f6425ae
..
865ae07
100644
(file)
--- 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
import base64
from django.db.models import F, Q
from planetstack.config import Config
-from observer.openstacksyncstep import OpenStackSyncStep
+from o
penstack_o
bserver.openstacksyncstep import OpenStackSyncStep
from core.models.site import *
from observer.ansible import *
from core.models.site import *
from observer.ansible import *
-class SyncControllerSite(OpenStackSyncStep):
+class SyncControllerSite
s
(OpenStackSyncStep):
requested_interval=0
provides=[ControllerSite]
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,
'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}
'tenant': controller_site.site.login_base,
'tenant_description': controller_site.site.name}