From 2e6e7474d0eac3c769918d6962410e23c699847d Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 30 Nov 2014 18:54:25 -0500 Subject: [PATCH] Controller replaces Deployment --- .../steps/sync_controller_sites.py | 32 +++++++++---------- .../steps/sync_controller_sites.yaml | 5 +++ 2 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 planetstack/openstack_observer/steps/sync_controller_sites.yaml diff --git a/planetstack/openstack_observer/steps/sync_controller_sites.py b/planetstack/openstack_observer/steps/sync_controller_sites.py index b5e9f9a..4e6988b 100644 --- a/planetstack/openstack_observer/steps/sync_controller_sites.py +++ b/planetstack/openstack_observer/steps/sync_controller_sites.py @@ -6,32 +6,32 @@ from observer.openstacksyncstep import OpenStackSyncStep from core.models.site import * from observer.ansible import * -class SyncSiteDeployments(OpenStackSyncStep): +class SyncControllerSites(OpenStackSyncStep): requested_interval=0 - provides=[SiteDeployments, Site] + provides=[ControllerSites, Site] - def sync_record(self, site_deployment): + def sync_record(self, controller_site): - 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, + template = os_template_env.get_template('sync_controller_sites.yaml') + tenant_fields = {'endpoint':controller_site.controller.auth_url, + 'admin_user': controller_site.controller.admin_user, + 'admin_password': controller_site.controller.admin_password, 'admin_tenant': 'admin', - 'tenant': site_deployment.site.login_base, - 'tenant_description': site_deployment.site.name} + 'tenant': controller_site.site.login_base, + 'tenant_description': controller_site.site.name} rendered = template.render(tenant_fields) - res = run_template('sync_site_deployments.yaml', tenant_fields) + res = run_template('sync_controller_sites.yaml', tenant_fields) if (len(res)==1): - site_deployment.tenant_id = res[0]['id'] - site_deployment.save() + 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']) - def delete_record(self, site_deployment): - if site_deployment.tenant_id: - driver = self.driver.admin_driver(deployment=site_deployment.deployment.name) - driver.delete_tenant(site_deployment.tenant_id) + def delete_record(self, controller_site): + if controller_site.tenant_id: + driver = self.driver.admin_driver(controller=controller_site.controller) + driver.delete_tenant(controller_site.tenant_id) diff --git a/planetstack/openstack_observer/steps/sync_controller_sites.yaml b/planetstack/openstack_observer/steps/sync_controller_sites.yaml new file mode 100644 index 0000000..4129802 --- /dev/null +++ b/planetstack/openstack_observer/steps/sync_controller_sites.yaml @@ -0,0 +1,5 @@ +--- +- hosts: 127.0.0.1 + connection: local + tasks: + - keystone_user: endpoint={{ endpoint }} login_user={{ admin_user }} login_password={{ admin_password }} login_tenant_name={{ admin_tenant }} tenant={{ tenant }} tenant_description="{{ tenant_description }}" -- 2.43.0