|
...
|
...
|
@@ -154,10 +154,12 @@ function create_marconi_accounts() {
|
|
154
|
154
|
MARCONI_USER=$(get_id keystone user-create --name=marconi \
|
|
155
|
155
|
--pass="$SERVICE_PASSWORD" \
|
|
156
|
156
|
--tenant-id $SERVICE_TENANT \
|
|
157
|
|
- --email=marconi@example.com)
|
|
|
157
|
+ --email=marconi@example.com \
|
|
|
158
|
+ | grep " id " | get_field 2)
|
|
158
|
159
|
keystone user-role-add --tenant-id $SERVICE_TENANT \
|
|
159
|
160
|
--user-id $MARCONI_USER \
|
|
160
|
161
|
--role-id $ADMIN_ROLE
|
|
|
162
|
+
|
|
161
|
163
|
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
|
|
162
|
164
|
MARCONI_SERVICE=$(keystone service-create \
|
|
163
|
165
|
--name=marconi \
|