From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sun, 6 Jan 2013 17:54:19 +0000 (-0500)
Subject: remove nova_admin_email config option
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3f4e596cead2f05ed311cc46c8f3631005d543aa;p=plcapi.git

remove nova_admin_email config option
---

diff --git a/bootstrap.py b/bootstrap.py
index 383760fa..71fdfde6 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -61,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,
diff --git a/config/default_config b/config/default_config
index 301ddb7d..0d8139ea 100644
--- a/config/default_config
+++ b/config/default_config
@@ -12,9 +12,8 @@ omf_enabled=0
 mail_support_address=support@localhost
 
 [nova]
-admin_user=admin
+admin_user=admin@domain.com
 admin_password=admin
-admin_email=admin@foobar.com
 admin_tenant=admin
 url=http://localhost:5000/v2.0/