From 9e8634014cd01cf6b23e12e1bd58fa95e38e7ca9 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 2 Feb 2017 11:28:14 -0500
Subject: [PATCH] all-in-one: run the script from p-o-i after clone

Stop deploying the scripts in /tmp, and require users to git clone the
repo before, instead of curl + bash command, which is unsecure and
not very useful.

Change-Id: I007a31f644a2a662b8ab3305454d6f1055a3e89b
---
 README.md     | 5 -----
 all-in-one.sh | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/README.md b/README.md
index 142df1f73..12aec9e4b 100644
--- a/README.md
+++ b/README.md
@@ -115,11 +115,6 @@ git clone git://git.openstack.org/openstack/puppet-openstack-integration
 cd puppet-openstack-integration
 ./all-in-one.sh
 ```
-or
-
-```bash
-curl -sL http://git.openstack.org/cgit/openstack/puppet-openstack-integration/plain/all-in-one.sh | bash
-```
 
 Look at [Description](#description) to see which services it will install
 (scenario-aio).
diff --git a/all-in-one.sh b/all-in-one.sh
index 449fe3828..a7268ce79 100755
--- a/all-in-one.sh
+++ b/all-in-one.sh
@@ -27,10 +27,6 @@
 # $ cd puppet-openstack-integration
 # $ ./all-in-one.sh
 #
-# or
-#
-# $ curl -sL http://git.openstack.org/cgit/openstack/puppet-openstack-integration/plain/all-in-one.sh | bash
-#
 
 set -e
 
@@ -38,11 +34,6 @@ if [ -n "$DEBUG" ]; then
   set -x
 fi
 
-# Prepare puppet-openstack-integration repository
-rm -rf /tmp/puppet-openstack-integration
-git clone git://git.openstack.org/openstack/puppet-openstack-integration /tmp/puppet-openstack-integration
-cd /tmp/puppet-openstack-integration
-
 export SCENARIO=scenario-aio
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions