From 9ba49cd82631ada84b8458b370ac535985d57725 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Thu, 10 Mar 2016 15:45:40 -0600
Subject: [PATCH] Remove rejoin-stack.sh

This command has never completely worked to restart DevStack.
It periodically prompts attempts to work around this brokenness
in ways that harm other functions.  Let's finally remove it.

Requiring a complete re-run of DevStack after a reboot has always
been intentional.

TODO: follow-up cleaning all of the screen hackage if this merges.

Change-Id: I2f61bb69cc110468a91dcaa4ee7653ede7048467
---
 functions-common |  2 +-
 rejoin-stack.sh  | 25 -------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100755 rejoin-stack.sh

diff --git a/functions-common b/functions-common
index 9e6fef22fb..ed1ff5ae12 100644
--- a/functions-common
+++ b/functions-common
@@ -1643,7 +1643,7 @@ function service_check {
     done
 
     if [ -n "$failures" ]; then
-        die $LINENO "More details about the above errors can be found with screen, with ./rejoin-stack.sh"
+        die $LINENO "More details about the above errors can be found with screen"
     fi
 }
 
diff --git a/rejoin-stack.sh b/rejoin-stack.sh
deleted file mode 100755
index 7048865fc9..0000000000
--- a/rejoin-stack.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# This script rejoins an existing screen, or re-creates a
-# screen session from a previous run of stack.sh.
-
-TOP_DIR=`dirname $0`
-
-# Import common functions in case the localrc (loaded via stackrc)
-# uses them.
-source $TOP_DIR/functions
-
-source $TOP_DIR/stackrc
-
-SCREENRC=$TOP_DIR/$SCREEN_NAME-screenrc
-# if screenrc exists, run screen
-if [[ -e $SCREENRC ]]; then
-    if screen -ls | egrep -q "[0-9]+.${SCREEN_NAME}"; then
-        echo "Attaching to already started screen session.."
-        exec screen -r $SCREEN_NAME
-    fi
-    exec screen -c $SCREENRC
-fi
-
-echo "Couldn't find $SCREENRC file; have you run stack.sh yet?"
-exit 1