From b6b25c7d8f9a3c1cceab29fbb4c4165e3b7d8469 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <andrey-mp@yandex.ru>
Date: Thu, 29 Oct 2015 17:08:19 +0300
Subject: [PATCH] remove unused variables from install.sh

Change-Id: I4c25d2838e08cef8d6cba9e2ba800ba92a30deaf
---
 install.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index d54f96e0..d6f3ad15 100755
--- a/install.sh
+++ b/install.sh
@@ -10,6 +10,10 @@ LOG_DIR=/var/log/ec2api
 CONF_DIR=/etc/ec2api
 NOVA_CONF=/etc/nova/nova.conf
 SIGNING_DIR=/var/cache/ec2api
+CONF_FILE=$CONF_DIR/ec2api.conf
+APIPASTE_FILE=$CONF_DIR/api-paste.ini
+
+AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}
 
 #Check for environment
 if [[ -z "$OS_AUTH_URL" || -z "$OS_USERNAME" || -z "$OS_PASSWORD" ]]; then
@@ -245,8 +249,6 @@ add_role $SERVICE_USERID $SERVICE_TENANT $ADMIN_ROLE $SERVICE_USERNAME
 echo Creating log dir
 sudo install -d $LOG_DIR --owner=$USER
 
-CONF_FILE=$CONF_DIR/ec2api.conf
-APIPASTE_FILE=$CONF_DIR/api-paste.ini
 #copy conf files (do not override it)
 echo Creating configs
 sudo mkdir -p /etc/ec2api > /dev/null
@@ -257,14 +259,6 @@ if [ ! -s $APIPASTE_FILE ]; then
     sudo cp etc/ec2api/api-paste.ini $APIPASTE_FILE
 fi
 
-AUTH_HOST=${OS_AUTH_URL#*//}
-AUTH_HOST=${AUTH_HOST%:*}
-AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}
-AUTH_PORT=`openstack catalog show identity -f value|grep adminURL|awk '{print $2}'`
-AUTH_PORT=${AUTH_PORT##*:}
-AUTH_PORT=${AUTH_PORT%%/*}
-AUTH_PROTO=${OS_AUTH_URL%%:*}
-PUBLIC_URL=${OS_AUTH_URL%:*}:"$EC2API_PORT"/
 
 #update default config with some values
 iniset $CONF_FILE DEFAULT ec2api_listen_port "$EC2API_PORT"