openstack
/
devstack
Code Issues Proposed changes

Merge "Actually check if roles are set"

This commit is contained in:
Jenkins 2017-06-26 23:26:27 +00:00 committed by Gerrit Code Review
parent cb62ef8336 3e9b562d0b
commit 2967ca3dfd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
functions-common
View File

@ -864,10 +864,11 @@ function get_or_add_user_project_role {
# Gets user role id # Gets user role id
user_role_id=$(openstack role assignment list \ user_role_id=$(openstack role assignment list \
--role $1 \
--user $2 \ --user $2 \
--project $3 \ --project $3 \
$domain_args \ $domain_args \
| grep " $1 " | get_field 1) | grep '^|\s[a-f0-9]\+' | get_field 1)
if [[ -z "$user_role_id" ]]; then if [[ -z "$user_role_id" ]]; then
# Adds role to user and get it # Adds role to user and get it
openstack role add $1 \ openstack role add $1 \
@ -875,10 +876,11 @@ function get_or_add_user_project_role {
--project $3 \ --project $3 \
$domain_args $domain_args
user_role_id=$(openstack role assignment list \ user_role_id=$(openstack role assignment list \
--role $1 \
--user $2 \ --user $2 \
--project $3 \ --project $3 \
$domain_args \ $domain_args \
| grep " $1 " | get_field 1) | grep '^|\s[a-f0-9]\+' | get_field 1)
fi fi
echo $user_role_id echo $user_role_id
} }
@ -889,18 +891,20 @@ function get_or_add_user_domain_role {
local user_role_id local user_role_id
# Gets user role id # Gets user role id
user_role_id=$(openstack role assignment list \ user_role_id=$(openstack role assignment list \
--role $1 \
--user $2 \ --user $2 \
--domain $3 \ --domain $3 \
| grep " $1 " | get_field 1) | grep '^|\s[a-f0-9]\+' | get_field 1)
if [[ -z "$user_role_id" ]]; then if [[ -z "$user_role_id" ]]; then
# Adds role to user and get it # Adds role to user and get it
openstack role add $1 \ openstack role add $1 \
--user $2 \ --user $2 \
--domain $3 --domain $3
user_role_id=$(openstack role assignment list \ user_role_id=$(openstack role assignment list \
--role $1 \
--user $2 \ --user $2 \
--domain $3 \ --domain $3 \
| grep " $1 " | get_field 1) | grep '^|\s[a-f0-9]\+' | get_field 1)
fi fi
echo $user_role_id echo $user_role_id
} }
@ -911,6 +915,7 @@ function get_or_add_group_project_role {
local group_role_id local group_role_id
# Gets group role id # Gets group role id
group_role_id=$(openstack role assignment list \ group_role_id=$(openstack role assignment list \
--role $1 \
--group $2 \ --group $2 \
--project $3 \ --project $3 \
-f value) -f value)
@ -920,6 +925,7 @@ function get_or_add_group_project_role {
--group $2 \ --group $2 \
--project $3 --project $3
group_role_id=$(openstack role assignment list \ group_role_id=$(openstack role assignment list \
--role $1 \
--group $2 \ --group $2 \
--project $3 \ --project $3 \
-f value) -f value)