From 3d63892930a26d27a4a74031b451ec35db1c4f3f Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Mon, 11 Aug 2014 17:52:53 +0200 Subject: [PATCH] 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 --- labs/scripts/setup_neutron_controller.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh index fe8dc3bb..530a19ae 100755 --- a/labs/scripts/setup_neutron_controller.sh +++ b/labs/scripts/setup_neutron_controller.sh @@ -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