| commit | c6646a650e9cd8b834797a8943056d329f262c4c | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Aug 24 17:21:40 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Aug 24 17:21:40 2015 +0000 |
| tree | 7d38ed02ddbbca5bc0235375a07c34e755a3b591 | |
| parent | b64638e50a0eef89c6605ac3aa860d40c93a553c [diff] | |
| parent | dbdee698700d9c7cf86ad3cde74e8b4347ef757a [diff] |
Merge "Use standard get_or_create_role to find role"
diff --git a/lib/swift b/lib/swift index dac121b..fc736a6 100644 --- a/lib/swift +++ b/lib/swift
@@ -610,7 +610,7 @@ KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql} - local another_role=$(openstack role list | awk "/ anotherrole / { print \$2 }") + local another_role=$(get_or_create_role "anotherrole") # NOTE(jroll): Swift doesn't need the admin role here, however Ironic uses # temp urls, which break when uploaded by a non-admin role