Merged ansible branch into master
diff --git a/planetstack/openstack_observer/steps/sync_site_deployments.py b/planetstack/openstack_observer/steps/sync_site_deployments.py
index a8a00f6..b5e9f9a 100644
--- a/planetstack/openstack_observer/steps/sync_site_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_site_deployments.py
@@ -4,24 +4,32 @@
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
from core.models.site import *
+from observer.ansible import *
class SyncSiteDeployments(OpenStackSyncStep):
requested_interval=0
provides=[SiteDeployments, Site]
def sync_record(self, site_deployment):
- if not site_deployment.tenant_id:
- driver = self.driver.admin_driver(deployment=site_deployment.deployment.name)
- tenant = driver.create_tenant(tenant_name=site_deployment.site.login_base,
- description=site_deployment.site.name,
- enabled=site_deployment.site.enabled)
- site_deployment.tenant_id = tenant.id
- site_deployment.save()
- elif site_deployment.site.id and site_deployment.tenant_id:
- driver = self.driver.admin_driver(deployment=site_deployment.deployment.name)
- driver.update_tenant(site_deployment.tenant_id,
- description=site_deployment.site.name,
- enabled=site_deployment.site.enabled)
+
+ template = os_template_env.get_template('sync_site_deployments.yaml')
+ tenant_fields = {'endpoint':site_deployment.deployment.auth_url,
+ 'admin_user': site_deployment.deployment.admin_user,
+ 'admin_password': site_deployment.deployment.admin_password,
+ 'admin_tenant': 'admin',
+ 'tenant': site_deployment.site.login_base,
+ 'tenant_description': site_deployment.site.name}
+
+ rendered = template.render(tenant_fields)
+ res = run_template('sync_site_deployments.yaml', tenant_fields)
+
+ if (len(res)==1):
+ site_deployment.tenant_id = res[0]['id']
+ site_deployment.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'])
def delete_record(self, site_deployment):
if site_deployment.tenant_id: