Defer error checking to ansible layer

[plstackapi.git] / planetstack / openstack_observer / steps / sync_controller_sites.py

diff --git a/planetstack/openstack_observer/steps/sync_controller_sites.py b/planetstack/openstack_observer/steps/sync_controller_sites.py
index f6425ae..3aa20d7 100644 (file)
--- a/planetstack/openstack_observer/steps/sync_controller_sites.py
+++ b/planetstack/openstack_observer/steps/sync_controller_sites.py
@@ -2,13 +2,13 @@ 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]
+    provides=[ControllerSite, Site]
 
     def fetch_pending(self, deleted=False):
         pending = super(OpenStackSyncStep, self).fetch_pending(deleted)
@@ -21,20 +21,15 @@ 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}
 
        rendered = template.render(tenant_fields)
-       res = run_template('sync_controller_sites.yaml', tenant_fields, path='controller_sites')
+       res = run_template('sync_controller_sites.yaml', tenant_fields, path='controller_sites', expected_num=1)
 
-       if (len(res)==1):
-               controller_site.tenant_id = res[0]['id']
-               controller_site.save()
-       elif (len(res)):
-               raise Exception('Could not assign roles for user %s'%tenant_fields['tenant'])
-       else:
-               raise Exception('Could not create or update user %s'%tenant_fields['tenant'])
+       controller_site.tenant_id = res[0]['id']
+        controller_site.save()
             
     def delete_record(self, controller_site):
        if controller_site.tenant_id: