You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/08/22 11:52:05 UTC
git commit: Fixed cartridge security group & instant type
configurations, setting owner of stratos folder structure,
updated clean.sh to safely remove installed content,
renamed stratos foundation database name variable
Updated Branches:
refs/heads/master 757a6d4a8 -> 298ceb96c
Fixed cartridge security group & instant type configurations, setting owner of stratos folder structure, updated clean.sh to safely remove installed content, renamed stratos foundation database name variable
Signed-off-by: Manula Thantriwatte <ma...@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/298ceb96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/298ceb96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/298ceb96
Branch: refs/heads/master
Commit: 298ceb96c274cbe9710b4f84130a679391ba83c5
Parents: 757a6d4
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Thu Aug 22 15:03:14 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Thu Aug 22 15:21:12 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/clean.sh | 26 ++++++++++++++++++--
tools/stratos-installer/conf/setup.conf | 13 +++++-----
.../repository/conf/cartridge-config.properties | 8 +++---
.../openstack-cartridge-setup.sh | 4 +--
tools/stratos-installer/setup.sh | 25 ++++++++++---------
5 files changed, 50 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/298ceb96/tools/stratos-installer/clean.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/clean.sh b/tools/stratos-installer/clean.sh
index 32fcd94..84656c6 100755
--- a/tools/stratos-installer/clean.sh
+++ b/tools/stratos-installer/clean.sh
@@ -94,8 +94,30 @@ mysql -u $mysql_user -p$mysql_pass -e "DROP DATABASE IF EXISTS stratos_foundatio
echo 'Removing userstore database'
mysql -u $mysql_user -p$mysql_pass -e "DROP DATABASE IF EXISTS userstore;"
-echo 'Removing stratos content'
-rm -rf $stratos_path/*
+if [[ -d $stratos_path/scripts ]]; then
+ echo 'Removing scripts'
+ rm -rf $stratos_path/scripts
+fi
+
+if [[ -d $cc_path ]]; then
+ echo 'Removing CC'
+ rm -rf $cc_path
+fi
+
+if [[ -d $sc_path ]]; then
+ echo 'Removing SC'
+ rm -rf $sc_path
+fi
+
+if [[ -d $elb_path ]]; then
+ echo 'Removing ELB'
+ rm -rf $elb_path
+fi
+
+if [[ -d $agent_path ]]; then
+ echo 'Removing Agent'
+ rm -rf $agent_path
+fi
echo 'Removing logs'
rm -rf $log_path/*
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/298ceb96/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index a14c6b2..eb30d99 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -44,6 +44,7 @@ export host_user="" #A host user account for stratos. If not provided deafult is
export mysql_connector_jar=$stratos_pack_path/"mysql-connector-java-5.1.25.jar" #mysql connector jar file name
+
# SC configuration
# ----------------------------------------------------------------------------
export sc_path=$stratos_path/"apache-stratos-sc-3.0.0-SNAPSHOT"
@@ -60,11 +61,11 @@ export userstore_db_port="3306"
export userstore_db_user="root"
export userstore_db_pass="mysql"
-export s_foundation_db_hostname="stratos.apache.org"
-export s_foundation_db_schema="stratos_foundation"
-export s_foundation_db_port="3306"
-export s_foundation_db_user="root"
-export s_foundation_db_pass="mysql"
+export stratos_foundation_db_hostname="stratos.apache.org"
+export stratos_foundation_db_schema="stratos_foundation"
+export stratos_foundation_db_port="3306"
+export stratos_foundation_db_user="root"
+export stratos_foundation_db_pass="mysql"
export sc_https_port="9445"
export sc_http_port="9765"
@@ -175,7 +176,7 @@ export openstack_keypair_name="key-pair-name" #Name of the openstack key pair. T
export openstack_image_id="RegionOne/" #No need to change this as of now
export nova_region="RegionOne"
-export openstack_instance_type_tiny="RegionOne\/1"
+export openstack_instance_type_tiny="RegionOne\/2"
export openstack_instance_type_small="RegionOne\/2"
export openstack_security_group="security-group-name"
export php_cartridge_image_id=""
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/298ceb96/tools/stratos-installer/config/sc/repository/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/sc/repository/conf/cartridge-config.properties b/tools/stratos-installer/config/sc/repository/conf/cartridge-config.properties
index 3c59bc1..7d8cc83 100644
--- a/tools/stratos-installer/config/sc/repository/conf/cartridge-config.properties
+++ b/tools/stratos-installer/config/sc/repository/conf/cartridge-config.properties
@@ -9,11 +9,11 @@ git.repo.notification.url=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepoNotific
identity.server.url=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepoNotificationService/
repository.info.epr=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepositoryInformationService
-adc.jdbc.url=jdbc:mysql://S2_DB_HOSTNAME:S2_DB_PORT/S2_DB_SCHEMA
-adc.jdbc.username=S2_DB_USER
-adc.jdbc.password=S2_DB_PASS
+adc.jdbc.url=jdbc:mysql://STRATOS_FOUNDATION_DB_HOSTNAME:STRATOS_FOUNDATION_DB_PORT/STRATOS_FOUNDATION_DB_SCHEMA
+adc.jdbc.username=STRATOS_FOUNDATION_DB_USER
+adc.jdbc.password=STRATOS_FOUNDATION_DB_PASS
adc.jdbc.driver=com.mysql.jdbc.Driver
-#adc.jdbc.db=S2_DB_SCHEMA
+#adc.jdbc.db=STRATOS_DB_SCHEMA
feature.internalrepo.enabled=false
feature.multitenant.multiplesubscription.enabled=false
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/298ceb96/tools/stratos-installer/openstack-cartridge-setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/openstack-cartridge-setup.sh b/tools/stratos-installer/openstack-cartridge-setup.sh
index a76c2a7..711776b 100755
--- a/tools/stratos-installer/openstack-cartridge-setup.sh
+++ b/tools/stratos-installer/openstack-cartridge-setup.sh
@@ -83,7 +83,7 @@ cp -f repository/deployment/server/cartridges/mysql.xml repository/deployment/se
cat repository/deployment/server/cartridges/mysql.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$openstack_instance_type_tiny\"/>@g" > repository/deployment/server/cartridges/mysql.xml
cp -f repository/deployment/server/cartridges/mysql.xml repository/deployment/server/cartridges/mysql.xml.orig
-cat repository/deployment/server/cartridges/mysql.xml.orig | sed -e "s@<property name=\"securityGroup\" value=\"*.*\"/>@<property name=\"securityGroup\" value=\"$openstack_security_group\"/>@g" > repository/deployment/server/cartridges/mysql.xml
+cat repository/deployment/server/cartridges/mysql.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$openstack_security_group\"/>@g" > repository/deployment/server/cartridges/mysql.xml
cp -f repository/deployment/server/cartridges/mysql.xml repository/deployment/server/cartridges/mysql.xml.orig
cat repository/deployment/server/cartridges/mysql.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$nova_region/$mysql_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/mysql.xml
@@ -109,7 +109,7 @@ cp -f repository/deployment/server/cartridges/php.xml repository/deployment/serv
cat repository/deployment/server/cartridges/php.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$openstack_instance_type_tiny\"/>@g" > repository/deployment/server/cartridges/php.xml
cp -f repository/deployment/server/cartridges/php.xml repository/deployment/server/cartridges/php.xml.orig
-cat repository/deployment/server/cartridges/php.xml.orig | sed -e "s@<property name=\"securityGroup\" value=\"*.*\"/>@<property name=\"securityGroup\" value=\"$openstack_security_group\"/>@g" > repository/deployment/server/cartridges/php.xml
+cat repository/deployment/server/cartridges/php.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$openstack_security_group\"/>@g" > repository/deployment/server/cartridges/php.xml
#cp -f repository/deployment/server/cartridges/php.xml repository/deployment/server/cartridges/php.xml.orig
#cat repository/deployment/server/cartridges/php.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$nova_region/$php_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/php.xml
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/298ceb96/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 23917f9..19f0897 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -151,8 +151,8 @@ fi
if [[ -z $sc_hostname ]]; then
sc_hostname=$hostname
fi
-if [[ -z $s_foundation_db_hostname ]]; then
- s_foundation_db_hostname=$hostname
+if [[ -z $stratos_foundation_db_hostname ]]; then
+ stratos_foundation_db_hostname=$hostname
fi
if [[ -z $agent_hostname ]]; then
agent_hostname=$hostname
@@ -200,7 +200,7 @@ if [[ $sc = "true" ]]; then
fi
- if [[ ( -z $email|| -z $s_foundation_db_user || -z $s_foundation_db_pass || -z $hostname
+ if [[ ( -z $email|| -z $stratos_foundation_db_user || -z $stratos_foundation_db_pass || -z $hostname
|| -z $sc_path ) ]]; then
helpsetup
exit 1
@@ -359,16 +359,16 @@ if [[ $sc = "true" ]]; then
cat repository/conf/cartridge-config.properties.orig | sed -e "s@SC_HOSTNAME:SC_HTTPS_PORT@$sc_ip:$sc_https_port@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
- cat repository/conf/cartridge-config.properties.orig | sed -e "s@s_foundation_db_HOSTNAME:s_foundation_db_PORT@$s_foundation_db_hostname:$s_foundation_db_port@g" > repository/conf/cartridge-config.properties
+ cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_FOUNDATION_DB_HOSTNAME:STRATOS_FOUNDATION_DB_PORT@$stratos_foundation_db_hostname:$stratos_foundation_db_port@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
- cat repository/conf/cartridge-config.properties.orig | sed -e "s@s_foundation_db_USER@$s_foundation_db_user@g" > repository/conf/cartridge-config.properties
+ cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_FOUNDATION_DB_USER@$stratos_foundation_db_user@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
- cat repository/conf/cartridge-config.properties.orig | sed -e "s@s_foundation_db_PASS@$s_foundation_db_pass@g" > repository/conf/cartridge-config.properties
+ cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_FOUNDATION_DB_PASS@$stratos_foundation_db_pass@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
- cat repository/conf/cartridge-config.properties.orig | sed -e "s@s_foundation_db_SCHEMA@$s_foundation_db_schema@g" > repository/conf/cartridge-config.properties
+ cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_FOUNDATION_DB_SCHEMA@$stratos_foundation_db_schema@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
cat repository/conf/cartridge-config.properties.orig | sed -e "s@CC_HOSTNAME:MB_LISTEN_PORT@$cc_hostname:$mb_listen_port@g" > repository/conf/cartridge-config.properties
@@ -442,12 +442,12 @@ if [[ $sc = "true" ]]; then
# -----------------------------------------------
echo "Create and configure MySql Databases" >> $LOG
- echo "Create userstore database"
+ echo "Creating userstore database"
mysql -u$userstore_db_user -p$userstore_db_pass < $resource_path/userstore.sql
#mysql -u$userstore_db_user -p$userstore_db_pass < $resource_path/registry.sql #registry schema is only for AF
- echo "Create stratos_foundation database"
- mysql -u$s_foundation_db_user -p$s_foundation_db_pass < $resource_path/stratos_foundation.sql
+ echo "Creating stratos_foundation database"
+ mysql -u$stratos_foundation_db_user -p$stratos_foundation_db_pass < $resource_path/stratos_foundation.sql
#mysql -u$billing_db_username -p$billing_db_password < $resource_path/billing-mysql.sql
@@ -809,6 +809,9 @@ if [[ $demo = "ec2" ]]; then
./ec2-cartridge-setup.sh
fi
+echo 'Changing owner of '$stratos_path' to '$host_user:$host_user
+chown $host_user:$host_user $stratos_path -R
+
echo "Apache Stratos setup has successfully completed"
read -p "Do you want to start the servers [y/n]? " answer
@@ -822,8 +825,6 @@ echo "Starting the servers" >> $LOG
#Starting the servers in the following order is recommended
#mb, cc, elb, is, agent, sc
-chown $host_user:$host_user -R $stratos_path/*
-
echo "Starting up servers. This may take time. Look at $LOG file for server startup details"
chown -R $host_user.$host_user $log_path