You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/09/17 08:46:13 UTC
git commit: Modifications in stratos-installer
Updated Branches:
refs/heads/3.0.0-incubating d58ce96ae -> ed3a75e7f
Modifications in stratos-installer
Signed-off-by: Lahiru Sandaruwan <la...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ed3a75e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ed3a75e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ed3a75e7
Branch: refs/heads/3.0.0-incubating
Commit: ed3a75e7f2e1f1c82e0410ce7a768360fdb10196
Parents: d58ce96
Author: Dinesh Bandara <di...@wso2.com>
Authored: Tue Sep 17 11:08:55 2013 +0530
Committer: Lahiru Sandaruwan <la...@wso2.com>
Committed: Tue Sep 17 12:21:11 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/demo.sh | 4 +++-
tools/stratos-installer/setup.sh | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ed3a75e7/tools/stratos-installer/demo.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/demo.sh b/tools/stratos-installer/demo.sh
index ac2618b..dc69102 100755
--- a/tools/stratos-installer/demo.sh
+++ b/tools/stratos-installer/demo.sh
@@ -26,7 +26,7 @@
set -e
source "./conf/setup.conf"
-SLEEP=100
+SLEEP=40
export LOG=$log_path/stratos-ec2-user-data.log
# Make sure the user is running as root.
@@ -146,6 +146,7 @@ cat conf/setup.conf.orig | sed -e "s@export ec2_availability_zone=\"*.*\"@export
cp -f conf/setup.conf conf/setup.conf.orig
cat conf/setup.conf.orig | sed -e "s@export ec2_security_groups=\"*.*\"@export ec2_security_groups=\"$SECURITY_GROUP\"@g" > conf/setup.conf
+
# Updating conf/setup.conf with relevent data
# ----------------------------------------------------------------------------
@@ -176,6 +177,7 @@ cat conf/setup.conf.orig | sed -e "s@export ec2_provider_enabled=false@export ec
cp -f conf/setup.conf conf/setup.conf.orig
cat conf/setup.conf.orig | sed -e "s@export openstack_provider_enabled=true@export openstack_provider_enabled=false@g" > conf/setup.conf
+rm -f conf/setup.conf.orig
# Mapping domain/host names for each product
# ----------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ed3a75e7/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 08df083..8252f21 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -110,7 +110,7 @@ function helpsetup {
echo ""
}
-echo "user provided in conf/setup.conf is $host_user. If you want to provide some other user name please specify it at the prompt."
+echo "user provided in conf/setup.conf is $host_user. If you want to provide some other username please specify it at the prompt."
echo "If you want to continue with $host_user just press enter to continue"
read username
if [[ $username != "" ]]; then