added create_network(), delete_network(), create_subnet(), delete_subnet(), process_t...

[plcapi.git] / bootstrap.py

diff --git a/bootstrap.py b/bootstrap.py
index d29cc3e..71fdfde 100755 (executable)
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -39,6 +39,7 @@ def bootstrap():
         }
         site = Site(api, fields=site_fields)
         site.sync()
+        site = Sites(api, {'login_base': site_fields['login_base']})[0]
     else:
         site = sites[0]    
           
@@ -60,10 +61,11 @@ def bootstrap():
     # bootstrap admin user
     persons = Persons(api, {'email': config.nova_admin_email})
     if not persons:     
-        logger.info("bootstrap: adding admin user record")  
-        person_fields = {'email': config.nova_admin_email,
-                         'first_name': config.nova_admin_user,
-                         'last_name': config.nova_admin_user,
+        logger.info("bootstrap: adding admin user record")
+        name = config.nova_admin_user[:config.nova_admin_user.index('@')]  
+        person_fields = {'email': config.nova_admin_user,
+                         'first_name': name,
+                         'last_name': name,
                          'password': config.nova_admin_password,
                          'tenant_id': site['tenant_id'],
                          'keystone_id': admin.id,