Complete moving Keystone setup out of keystone_data.sh
* Move remaining role creation to create_keystone_accounts()
* Move glance creation to create_glance_accounts()
* Move nova/ec2/s3 creation to create_nova_accounts()
* Move ceilometer creation to create_ceilometer_accounts()
* Move tempest creation to create_tempest_accounts()
* Convert moved code to use OpenStackClient for setup
* files/keystone_data.sh is removed
Note that the SERVICE_TENANT and ADMIN_ROLE lookups in the other service
implementations are not necessary with OSC, all operations can be done
using names rather than requiring IDs.
Change-Id: I4283ca0036ae39fd44ed2eed834b69d78e4f8257
diff --git a/lib/glance b/lib/glance
index 8a4c21b..51e4399 100644
--- a/lib/glance
+++ b/lib/glance
@@ -159,6 +159,49 @@
cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON
}
+# create_glance_accounts() - Set up common required glance accounts
+
+# Project User Roles
+# ------------------------------------------------------------------
+# SERVICE_TENANT_NAME glance service
+# SERVICE_TENANT_NAME glance-swift ResellerAdmin (if Swift is enabled)
+
+function create_glance_accounts {
+ if is_service_enabled g-api; then
+ openstack user create \
+ --password "$SERVICE_PASSWORD" \
+ --project $SERVICE_TENANT_NAME \
+ glance
+ openstack role add \
+ --project $SERVICE_TENANT_NAME \
+ --user glance \
+ service
+ # required for swift access
+ if is_service_enabled s-proxy; then
+ openstack user create \
+ --password "$SERVICE_PASSWORD" \
+ --project $SERVICE_TENANT_NAME \
+ glance-swift
+ openstack role add \
+ --project $SERVICE_TENANT_NAME \
+ --user glance-swift \
+ ResellerAdmin
+ fi
+ if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
+ openstack service create \
+ --type image \
+ --description "Glance Image Service" \
+ glance
+ openstack endpoint create \
+ --region RegionOne \
+ --publicurl "http://$GLANCE_HOSTPORT" \
+ --adminurl "http://$GLANCE_HOSTPORT" \
+ --internalurl "http://$GLANCE_HOSTPORT" \
+ glance
+ fi
+ fi
+}
+
# create_glance_cache_dir() - Part of the init_glance() process
function create_glance_cache_dir {
# Create cache dir