From 3f4e596cead2f05ed311cc46c8f3631005d543aa Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 6 Jan 2013 12:54:19 -0500 Subject: [PATCH] remove nova_admin_email config option --- bootstrap.py | 9 +++++---- config/default_config | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) 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/ -- 2.47.0