From 209ed8d9138bbed5f3b61c50356c44bbf6ecc2c4 Mon Sep 17 00:00:00 2001
From: blsaws <bryan.sullivan@att.com>
Date: Tue, 24 May 2016 10:35:07 -0700
Subject: Fix bugs found in cleanup testing

JIRA: COPPER-2

Change-Id: Ia8004db849bf6fc1384d4bb9735b6f073c6328e4
Signed-off-by: blsaws <bryan.sullivan@att.com>
---
 components/congress/install/bash/clean_congress.sh     | 8 +++-----
 components/congress/install/bash/install_congress_1.sh | 3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/components/congress/install/bash/clean_congress.sh b/components/congress/install/bash/clean_congress.sh
index e9f7371..d24fa05 100644
--- a/components/congress/install/bash/clean_congress.sh
+++ b/components/congress/install/bash/clean_congress.sh
@@ -22,7 +22,7 @@
 # - For Apex installs, on the jumphost, ssh to the undercloud VM and
 #     $ su stack
 # - For JOID installs, admin-openrc.sh saved from Horizon to ~/admin-openrc.sh
-# - Retrieve the copper remova script as below
+# - Retrieve the copper removal script as below
 # $ cd ~
 # $ wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/clean_congress.sh
 # $ bash clean_congress.sh
@@ -39,16 +39,14 @@ if [ "$dist" == "Ubuntu" ]; then
   echo "Stop the Congress service"
   # Have to use "python" here as congress-server does not show up in the process list (?)
   ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $CTLUSER@$CONGRESS_HOST "pkill python; exit"
-  source ~/admin-openrc.sh <<EOF
-openstack
-EOF
 else 
   export CTLUSER="heat-admin"
   echo "Stop the Congress service"
   ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $CTLUSER@$CONGRESS_HOST "pkill congress-server; exit"
-  source ~/admin-openrc.sh 
 fi
 
+source ~/admin-openrc.sh
+
 echo "Remove systemd integration"
 ssh -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $CTLUSER@$CONGRESS_HOST "sudo rm -f /usr/lib/systemd/system/openstack-congress.service; sudo rm -f /etc/init.d/congress-server; exit"
 
diff --git a/components/congress/install/bash/install_congress_1.sh b/components/congress/install/bash/install_congress_1.sh
index 423e887..f7fa442 100644
--- a/components/congress/install/bash/install_congress_1.sh
+++ b/components/congress/install/bash/install_congress_1.sh
@@ -72,7 +72,6 @@ EOF
   sed -i -- 's/echo/#echo/g' ~/admin-openrc.sh  
   sed -i -- 's/read -sr OS_PASSWORD_INPUT/#read -sr OS_PASSWORD_INPUT/g' ~/admin-openrc.sh
   sed -i -- 's/$OS_PASSWORD_INPUT/openstack/g' ~/admin-openrc.sh
-  cp ~/admin-openrc.sh ~/congress
 else
   # Centos
   echo "Centos-based install"
@@ -96,8 +95,8 @@ EOF
   scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ~/congress/env.sh $CTLUSER@$CONTROLLER_HOST1:/home/$CTLUSER/congress
   echo "Setup env for overcloud API access and copy to congress server"
   source ~/overcloudrc
+																														  cp ~/overcloudrc ~/admin-openrc.sh
   export OS_REGION_NAME=$(openstack endpoint list | awk "/ nova / { print \$4 }")
-  cp ~/overcloudrc ~/congress/admin-openrc.sh
   # sed command below is a workaound for a bug - region shows up twice for some reason
   cat <<EOF | sed '$d' >>~/admin-openrc.sh
 export OS_REGION_NAME=$OS_REGION_NAME
-- 
cgit 1.2.3-korg