labs: fix reading tenant id

Currently, setup_neutron_controller is reading the string "id" rather
than the actual tenant id which is in $4 (the pipes used as separators
in the table count as fields, too).

While we're at it, replace "service" with "$SERVICE_TENANT_NAME".

Change-Id: Id47d5c10ce426ff42237105c02f0dffdf4632cfc
This commit is contained in:
Roger Luethi 2014-08-11 17:52:53 +02:00
parent 07bfdf4e31
commit 3d63892930

View File

@ -52,7 +52,8 @@ keystone user-role-add \
echo "Configuring neutron to use keystone for authentication."
echo "Configuring neutron.conf"
conf=/etc/neutron/neutron.conf
service_tenant_id=$(keystone tenant-get service | awk '/ id / {print $2}')
service_tenant_id=$(keystone tenant-get "$SERVICE_TENANT_NAME" | awk '/ id / {print $4}')
echo "Service tenant id: $service_tenant_id"
# Configuring [DEFAULT] section
iniset_sudo $conf DEFAULT auth_strategy keystone