From 5705f9cf8b93ea46110325e8414b127b15813bfa Mon Sep 17 00:00:00 2001 From: Pranav Salunke Date: Sun, 20 Apr 2014 12:37:33 +0530 Subject: [PATCH] Fixed Keystone Scripts For some reason the keystone scripts were not updated as required for renaming quantum to neutron. This patch will tune the scripts in sync with the installation guide provided under Operator Training book. blueprint training-manuals Change-Id: Iafb205004d404451e39156680d139b6f05dd348e --- .../training-labs/Scripts/Keystone/Scripts/keystone_basic.sh | 4 ++-- .../Scripts/Keystone/Scripts/keystone_endpoints_basic.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_basic.sh b/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_basic.sh index 49f39a81bc..8105b03d40 100644 --- a/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_basic.sh +++ b/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_basic.sh @@ -53,8 +53,8 @@ keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $NOVA_USER --role-i GLANCE_USER=$(get_id keystone user-create --name=glance --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=glance@domain.com) keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $GLANCE_USER --role-id $ADMIN_ROLE -QUANTUM_USER=$(get_id keystone user-create --name=quantum --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=quantum@domain.com) -keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $QUANTUM_USER --role-id $ADMIN_ROLE +NEUTRON_USER=$(get_id keystone user-create --name=neutron --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=neutron@domain.com) +keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $NEUTRON_USER --role-id $ADMIN_ROLE CINDER_USER=$(get_id keystone user-create --name=cinder --pass="$SERVICE_PASSWORD" --tenant-id $SERVICE_TENANT --email=cinder@domain.com) keystone user-role-add --tenant-id $SERVICE_TENANT --user-id $CINDER_USER --role-id $ADMIN_ROLE diff --git a/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_endpoints_basic.sh b/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_endpoints_basic.sh index 25c8447d23..7954481606 100644 --- a/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_endpoints_basic.sh +++ b/doc/training-guides/training-labs/Scripts/Keystone/Scripts/keystone_endpoints_basic.sh @@ -107,7 +107,7 @@ keystone service-create --name cinder --type volume --description 'OpenStack Vol keystone service-create --name glance --type image --description 'OpenStack Image Service' keystone service-create --name keystone --type identity --description 'OpenStack Identity' keystone service-create --name ec2 --type ec2 --description 'OpenStack EC2 service' -keystone service-create --name quantum --type network --description 'OpenStack Networking service' +keystone service-create --name neutron --type network --description 'OpenStack Networking service' create_endpoint () { case $1 in