openstack/devstack
Code Issues Proposed changes

Merge "Uses keystone client instead of keystone-manage" into redux

Browse Source
This commit is contained in:
Jenkins 2012-02-13 20:58:01 +00:00 committed by Gerrit Code Review
commit b644295126
3 changed files with 64 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
files/keystone_data.sh
View File

@ -1,112 +1,86 @@
#!/bin/bash #!/bin/bash
BIN_DIR=${BIN_DIR:-.}
# Tenants # Tenants
ADMIN_TENANT=`$BIN_DIR/keystone-manage tenant --id-only create \ export SERVICE_TOKEN=$SERVICE_TOKEN
tenant_name=admin` export SERVICE_ENDPOINT=$SERVICE_ENDPOINT
DEMO_TENANT=`$BIN_DIR/keystone-manage tenant --id-only create \
tenant_name=demo` function get_id () {
INVIS_TENANT=`$BIN_DIR/keystone-manage tenant --id-only create \ echo `$@ | grep id | awk '{print $4}'`
tenant_name=invisible_to_admin` }
ADMIN_TENANT=`get_id keystone tenant-create --name=admin`
DEMO_TENANT=`get_id keystone tenant-create --name=demo`
INVIS_TENANT=`get_id keystone tenant-create --name=invisible_to_admin`
# Users # Users
ADMIN_USER=`$BIN_DIR/keystone-manage user --id-only create \ ADMIN_USER=`get_id keystone user-create \
name=admin \ --name=admin \
"password=%ADMIN_PASSWORD%" \ --pass="$ADMIN_PASSWORD" \
email=admin@example.com` --email=admin@example.com`
DEMO_USER=`$BIN_DIR/keystone-manage user --id-only create \ DEMO_USER=`get_id keystone user-create \
name=demo \ --name=demo \
"password=%ADMIN_PASSWORD%" \ --pass="$ADMIN_PASSWORD" \
email=demo@example.com` --email=admin@example.com`
# Roles # Roles
ADMIN_ROLE=`$BIN_DIR/keystone-manage role --id-only create \ ADMIN_ROLE=`get_id keystone role-create --name=admin`
name=admin` MEMBER_ROLE=`get_id keystone role-create --name=Member`
MEMBER_ROLE=`$BIN_DIR/keystone-manage role --id-only create \ KEYSTONEADMIN_ROLE=`get_id keystone role-create --name=KeystoneAdmin`
name=Member` KEYSTONESERVICE_ROLE=`get_id keystone role-create --name=KeystoneServiceAdmin`
KEYSTONEADMIN_ROLE=`$BIN_DIR/keystone-manage role --id-only create \ SYSADMIN_ROLE=`get_id keystone role-create --name=sysadmin`
name=KeystoneAdmin` NETADMIN_ROLE=`get_id keystone role-create --name=netadmin`
KEYSTONESERVICE_ROLE=`$BIN_DIR/keystone-manage role --id-only create \
name=KeystoneServiceAdmin`
SYSADMIN_ROLE=`$BIN_DIR/keystone-manage role --id-only create \
name=sysadmin`
NETADMIN_ROLE=`$BIN_DIR/keystone-manage role --id-only create \
name=netadmin`
# Add Roles to Users in Tenants # Add Roles to Users in Tenants
$BIN_DIR/keystone-manage role add_user_role \ keystone add-user-role $ADMIN_USER $ADMIN_ROLE $ADMIN_TENANT
role=$ADMIN_ROLE \ keystone add-user-role $DEMO_USER $MEMBER_ROLE $DEMO_TENANT
user=$ADMIN_USER \ keystone add-user-role $DEMO_USER $SYSADMIN_ROLE $DEMO_TENANT
tenant=$ADMIN_TENANT keystone add-user-role $DEMO_USER $NETADMIN_ROLE $DEMO_TENANT
$BIN_DIR/keystone-manage role add_user_role \ keystone add-user-role $DEMO_USER $MEMBER_ROLE $INVIS_TENANT
role=$MEMBER_ROLE \ keystone add-user-role $ADMIN_USER $ADMIN_ROLE $DEMO_TENANT
user=$DEMO_USER \
tenant=$DEMO_TENANT
$BIN_DIR/keystone-manage role add_user_role \
role=$SYSADMIN_ROLE \
user=$DEMO_USER \
tenant=$DEMO_TENANT
$BIN_DIR/keystone-manage role add_user_role \
role=$NETADMIN_ROLE \
user=$DEMO_USER \
tenant=$DEMO_TENANT
$BIN_DIR/keystone-manage role add_user_role \
role=$MEMBER_ROLE \
user=$DEMO_USER \
tenant=$INVIS_TENANT
$BIN_DIR/keystone-manage role add_user_role \
role=$ADMIN_ROLE \
user=$ADMIN_USER \
tenant=$DEMO_TENANT
# TODO(termie): these two might be dubious # TODO(termie): these two might be dubious
$BIN_DIR/keystone-manage role add_user_role \ keystone add-user-role $ADMIN_USER $KEYSTONEADMIN_ROLE $ADMIN_TENANT
role=$KEYSTONEADMIN_ROLE \ keystone add-user-role $ADMIN_USER $KEYSTONESERVICE_ROLE $ADMIN_TENANT
user=$ADMIN_USER \
tenant=$ADMIN_TENANT
$BIN_DIR/keystone-manage role add_user_role \
role=$KEYSTONESERVICE_ROLE \
user=$ADMIN_USER \
tenant=$ADMIN_TENANT
# Services # Services
$BIN_DIR/keystone-manage service create \ keystone service-create \
name=nova \ --name=nova \
service_type=compute \ --type=compute \
"description=Nova Compute Service" --description="Nova Compute Service"
$BIN_DIR/keystone-manage service create \ keystone service-create \
name=ec2 \ --name=ec2 \
service_type=ec2 \ --type=ec2 \
"description=EC2 Compatibility Layer" --description="EC2 Compatibility Layer"
$BIN_DIR/keystone-manage service create \ keystone service-create \
name=glance \ --name=glance \
service_type=image \ --type=image \
"description=Glance Image Service" --description="Glance Image Service"
$BIN_DIR/keystone-manage service create \ keystone service-create \
name=keystone \ --name=keystone \
service_type=identity \ --type=identity \
"description=Keystone Identity Service" --description="Keystone Identity Service"
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
$BIN_DIR/keystone-manage service create \ keystone service-create \
name=swift \ --name=swift \
service_type=object-store \ --type="object-store" \
"description=Swift Service" --description="Swift Service"
fi fi
# create ec2 creds and parse the secret and access key returned # create ec2 creds and parse the secret and access key returned
RESULT=`$BIN_DIR/keystone-manage ec2 create user_id=$ADMIN_USER tenant_id=$ADMIN_TENANT` RESULT=`keystone ec2-create-credentials --tenant_id=$ADMIN_TENANT --user_id=$ADMIN_USER`
ADMIN_ACCESS=`echo $RESULT | python -c "import sys; import json; result = json.loads(sys.stdin.read()); print result['access'];"` echo `$@ | grep id | awk '{print $4}'`
ADMIN_SECRET=`echo $RESULT | python -c "import sys; import json; result = json.loads(sys.stdin.read()); print result['secret'];"` ADMIN_ACCESS=`echo "$RESULT" | grep access | awk '{print $4}'`
ADMIN_SECRET=`echo "$RESULT" | grep secret | awk '{print $4}'`
RESULT=`$BIN_DIR/keystone-manage ec2 create user_id=$DEMO_USER tenant_id=$DEMO_TENANT` RESULT=`keystone ec2-create-credentials --tenant_id=$DEMO_TENANT --user_id=$DEMO_USER`
DEMO_ACCESS=`echo $RESULT | python -c "import sys; import json; result = json.loads(sys.stdin.read()); print result['access'];"` DEMO_ACCESS=`echo "$RESULT" | grep access | awk '{print $4}'`
DEMO_SECRET=`echo $RESULT | python -c "import sys; import json; result = json.loads(sys.stdin.read()); print result['secret'];"` DEMO_SECRET=`echo "$RESULT" | grep secret | awk '{print $4}'`
# write the secret and access to ec2rc # write the secret and access to ec2rc
cat > $DEVSTACK_DIR/ec2rc <<EOF cat > $DEVSTACK_DIR/ec2rc <<EOF
@ -115,37 +89,3 @@ ADMIN_SECRET=$ADMIN_SECRET
DEMO_ACCESS=$DEMO_ACCESS DEMO_ACCESS=$DEMO_ACCESS
DEMO_SECRET=$DEMO_SECRET DEMO_SECRET=$DEMO_SECRET
EOF EOF
#endpointTemplates
#$BIN_DIR/keystone-manage $* endpointTemplates add \
# RegionOne nova
# http://%SERVICE_HOST%:8774/v1.1/%tenant_id%
# http://%SERVICE_HOST%:8774/v1.1/%tenant_id%
# http://%SERVICE_HOST%:8774/v1.1/%tenant_id% 1 1
#$BIN_DIR/keystone-manage $* endpointTemplates add
# RegionOne ec2
# http://%SERVICE_HOST%:8773/services/Cloud
# http://%SERVICE_HOST%:8773/services/Admin
# http://%SERVICE_HOST%:8773/services/Cloud 1 1
#$BIN_DIR/keystone-manage $* endpointTemplates add
# RegionOne glance
# http://%SERVICE_HOST%:9292/v1
# http://%SERVICE_HOST%:9292/v1
# http://%SERVICE_HOST%:9292/v1 1 1
#$BIN_DIR/keystone-manage $* endpointTemplates add
# RegionOne keystone
# http://%SERVICE_HOST%:5000/v2.0
# http://%SERVICE_HOST%:35357/v2.0
# http://%SERVICE_HOST%:5000/v2.0 1 1
#if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
# $BIN_DIR/keystone-manage $* endpointTemplates add
# RegionOne swift
# http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id%
# http://%SERVICE_HOST%:8080/
# http://%SERVICE_HOST%:8080/v1/AUTH_%tenant_id% 1 1
#fi
# Tokens
#$BIN_DIR/keystone-manage token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00

2
openrc
View File

@ -42,7 +42,7 @@ export OS_PASSWORD=${NOVA_PASSWORD}
# #
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We # *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We
# will use the 1.1 *compute api* # will use the 1.1 *compute api*
export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0/} export NOVA_URL=${NOVA_URL:-http://$SERVICE_HOST:5000/v2.0}
export OS_AUTH_URL=${NOVA_URL} export OS_AUTH_URL=${NOVA_URL}
# Currently novaclient needs you to specify the *compute api* version. This # Currently novaclient needs you to specify the *compute api* version. This

20
stack.sh
View File

@ -1311,26 +1311,14 @@ if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
exit 1 exit 1
fi fi
# keystone_data.sh creates our admin user and our ``SERVICE_TOKEN``.
KEYSTONE_DATA=$KEYSTONE_DIR/bin/keystone_data.sh
cp $FILES/keystone_data.sh $KEYSTONE_DATA
sudo sed -e "
s,%KEYSTONE_AUTH_HOST%,$KEYSTONE_AUTH_HOST,g;
s,%KEYSTONE_AUTH_PORT%,$KEYSTONE_AUTH_PORT,g;
s,%KEYSTONE_AUTH_PROTOCOL%,$KEYSTONE_AUTH_PROTOCOL,g;
s,%KEYSTONE_SERVICE_HOST%,$KEYSTONE_SERVICE_HOST,g;
s,%KEYSTONE_SERVICE_PORT%,$KEYSTONE_SERVICE_PORT,g;
s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;
s,%SERVICE_HOST%,$SERVICE_HOST,g;
s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g;
s,%ADMIN_PASSWORD%,$ADMIN_PASSWORD,g;
" -i $KEYSTONE_DATA
# initialize keystone with default users/endpoints # initialize keystone with default users/endpoints
pushd $KEYSTONE_DIR pushd $KEYSTONE_DIR
$KEYSTONE_DIR/bin/keystone-manage db_sync $KEYSTONE_DIR/bin/keystone-manage db_sync
DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES BIN_DIR=$KEYSTONE_DIR/bin bash $KEYSTONE_DATA
popd popd
# keystone_data.sh creates services, admin and demo users, and roles.
SERVICE_ENDPOINT=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0
ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT DEVSTACK_DIR=$TOP_DIR ENABLED_SERVICES=$ENABLED_SERVICES bash $FILES/keystone_data.sh
fi fi