|
...
|
...
|
@@ -1296,8 +1296,9 @@ fi
|
|
1296
|
1296
|
save_stackenv
|
|
1297
|
1297
|
|
|
1298
|
1298
|
# Update/create user clouds.yaml file.
|
|
1299
|
|
-# clouds.yaml will have a `devstack` entry for the `demo` user for the `demo`
|
|
1300
|
|
-# project.
|
|
|
1299
|
+# clouds.yaml will have
|
|
|
1300
|
+# - A `devstack` entry for the `demo` user for the `demo` project.
|
|
|
1301
|
+# - A `devstack-admin` entry for the `admin` user for the `admin` project.
|
|
1301
|
1302
|
|
|
1302
|
1303
|
# The location is a variable to allow for easier refactoring later to make it
|
|
1303
|
1304
|
# overridable. There is currently no usecase where doing so makes sense, so
|
|
...
|
...
|
@@ -1320,6 +1321,16 @@ $TOP_DIR/tools/update_clouds_yaml.py \
|
|
1320
|
1320
|
--os-username demo \
|
|
1321
|
1321
|
--os-password $ADMIN_PASSWORD \
|
|
1322
|
1322
|
--os-project-name demo
|
|
|
1323
|
+$TOP_DIR/tools/update_clouds_yaml.py \
|
|
|
1324
|
+ --file $CLOUDS_YAML \
|
|
|
1325
|
+ --os-cloud devstack-admin \
|
|
|
1326
|
+ --os-region-name $REGION_NAME \
|
|
|
1327
|
+ --os-identity-api-version $IDENTITY_API_VERSION \
|
|
|
1328
|
+ $CA_CERT_ARG \
|
|
|
1329
|
+ --os-auth-url $KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION \
|
|
|
1330
|
+ --os-username admin \
|
|
|
1331
|
+ --os-password $ADMIN_PASSWORD \
|
|
|
1332
|
+ --os-project-name admin
|
|
1323
|
1333
|
|
|
1324
|
1334
|
|
|
1325
|
1335
|
# Wrapup configuration
|