openstack/ironic
Code Issues Proposed changes

Update add nova user to baremetal_admin behaviour

Browse Source 
Some jobs/installations install ironic without nova. We need to
check that nova service is enabled/installed before adding nova
user to baremetal_admin. Otherwise it leads to deployment errors.

Change-Id: I7d753085d5c8ff6633fba3947752aed0e99c72b2
Closes-Bug: #1610011
This commit is contained in:
Vasyl Saienko 2016-08-05 09:39:39 +03:00
parent bc106b56bb
commit fc92d5ce43
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/ironic
View File

@ -745,7 +745,9 @@ function create_ironic_accounts {
# Create additional bare metal tenant and roles # Create additional bare metal tenant and roles
get_or_create_role baremetal_admin get_or_create_role baremetal_admin
get_or_create_role baremetal_observer get_or_create_role baremetal_observer
get_or_add_user_project_role baremetal_admin nova $SERVICE_PROJECT_NAME if is_service_enabled nova; then
get_or_add_user_project_role baremetal_admin nova $SERVICE_PROJECT_NAME
fi
get_or_add_user_project_role baremetal_observer demo demo get_or_add_user_project_role baremetal_observer demo demo
fi fi
} }