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/09/06 06:32:04 UTC
git commit: Updated readme file, clean.sh parameters,
cartridge file names, default configuration values,
added comments on iaas provider configuration
Updated Branches:
refs/heads/master a0181495e -> 7b141e3fa
Updated readme file, clean.sh parameters, cartridge file names, default configuration values, added comments on iaas provider configuration
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/7b141e3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7b141e3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7b141e3f
Branch: refs/heads/master
Commit: 7b141e3fab24e9a907e6dbe1bd5821f68b50ee64
Parents: a018149
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Fri Sep 6 09:47:01 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Fri Sep 6 10:01:00 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/README.txt | 84 +++++++++++---------
.../cartridges/ec2/ec2-mysql.xml | 36 +++++++++
.../cartridges/ec2/ec2-php.xml | 35 ++++++++
.../cartridges/ec2/ec2-tomcat.xml | 35 ++++++++
.../cartridges/ec2/ec2_mysql.xml | 36 ---------
.../cartridges/ec2/ec2_php.xml | 35 --------
.../cartridges/ec2/ec2_tomcat.xml | 35 --------
tools/stratos-installer/clean.sh | 12 +--
tools/stratos-installer/conf/setup.conf | 20 ++---
tools/stratos-installer/ec2-cartridge.sh | 66 +++++++--------
tools/stratos-installer/setup.sh | 5 +-
11 files changed, 203 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/README.txt
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/README.txt b/tools/stratos-installer/README.txt
index 73dd9ff..afa0523 100644
--- a/tools/stratos-installer/README.txt
+++ b/tools/stratos-installer/README.txt
@@ -1,28 +1,28 @@
Apahe Stratos version 3.0.0
---------------------------------
-20th August 2013
+5th September 2013
Welcome to the Apache Stratos 3.0.0
Important
----------------------------------------
-Apache Stratos could be installed on a single node or on multiple nodes. If you are installing on
-multiple nodes copy stratos_installer to each node and update configuration parameters in conf/setup.conf accordingly.
+Apache Stratos could be installed on a single node or on multiple nodes. When installing on
+multiple nodes copy stratos_installer to each node and update configuration parameters in conf/setup.conf file accordingly.
-How to install
+How to Install
----------------------------------------
1. Install following prerequisites:
- java -jdk1.6.x
- git
- facter
- zip
- mysql-server
- Gitblits
+ java -jdk1.6.x
+ git
+ facter
+ zip
+ mysql-server
+ Gitblits
2. Build Apache Stratos from source:
@@ -30,40 +30,52 @@ How to install
cd incubator-stratos
mvn clean install
-3. Copy cloud controller, stratos controller, elb, agent and cli packages to a folder inside stratos_installer. May be this could be called "stratos_installer/packages":
-
- apache-stratos-cc-<version>.zip
- apache-stratos-sc-<version>.zip
- apache-stratos-elb-<version>.zip
- apache-stratos-agent-<version>.zip
- apache-stratos-cli-<version>.zip
-
-4. Download MySql Java connector from http://dev.mysql.com/downloads and copy the jar file to the above packages folder.
+3. Copy cloud controller, stratos controller, elb, agent and cli packages to a desired location (this will be identified as stratos-pack-path):
-5. Create and download the keys from IaaSs and store them on a secure location.
+ cp incubator-stratos/products/cloud-controller/modules/distribution/target/apache-stratos-cc-<version>.zip <stratos-pack-path>
+ cp incubator-stratos/products/stratos-controller/modules/distribution/target/apache-stratos-sc-<version>.zip <stratos-pack-path>
+ cp incubator-stratos/products/elb/modules/distribution/target/apache-stratos-elb-<version>.zip <stratos-pack-path>
+ cp incubator-stratos/products/stratos-agent/distribution/target/apache-stratos-agent-<version>.zip <stratos-pack-path>
-6. If Apache Stratos being setup in multiple nodes open up the security rules in IaaSs for the following ports (defined in ./conf/setup.conf)
- 22, 443, 8280, 4103, 4100, agent_https_port, agent_http_port, elb_port, agent_clustering_port, sc_cluster_port, elb_cluster_port,
- cassandra_port, stratos_db_port and userstore_db_port.
+4. Download WSO2 Message Broker binary distribution from http://wso2.com and copy it to stratos-pack-path. Here you could use any preferred
+ message broker product which supports AMPQ.
-7. Prepare cartridge images and upload them to the IaaSs. Please refer Apache Stratos documentation for more information on creating cartridge images.
+5. Extract WSO2 Message Broker distribution to desired path (this will be identified as stratos-path) and set it's port offset
+ in repository/conf/carbon.xml to 5. This will set the actual port to 5677.
-8. Update ./conf/setup.conf and configure parameters.
+6. Download MySql Java connector from http://dev.mysql.com/downloads and copy the jar file to stratos-pack-path.
-9. Start a message broker for communication of Cloud Controller and other products,here we show how to use WSO2 MB for this. Download WSO2 MB from http://wso2.com/products/message-broker/ and extract into prefered location. Let's say the extracted directory is WSO2MB_HOME. Then find portoffset value at WSO2MB_HOME/repository/conf/carbon.xml and set it to 5.
-Start the MB server with wso2server.sh script at WSO2MB_HOME/bin.
-E.g. ./wso2server.sh
+7. Create and download keys from IaaSs and store them on a secure location.
-10. Run setup.sh as root to install.
+8. If Apache Stratos being setup in multiple nodes open up the security rules in IaaSs for the following ports (defined in ./conf/setup.conf file):
+ agent_https_port, agent_http_port, elb_port, agent_clustering_port, sc_cluster_port, elb_cluster_port,
+ cassandra_port, stratos_db_port, userstore_db_port
- E.g -
- sudo ./setup.sh -p<product-list>
- <product-list> could be defined as "cc sc elb agent" or any other combination according to the deployment configuration. Use '-pall' to start all at once.
+9. Either download pre-built cartridge images from Apache Stratos website or create your own cartridges. Please refer Apache Stratos documentation
+ for more information on creating cartridge images. For Amazon EC2, you could find pre-built PHP, MySQL and Tomcat cartridges published in Amazon EC2
+ AMI image repository.
- If you need to clean the setup
- clean.sh
- E.g. -
- sudo ./clean.sh -a<mysql-username> -b<mysql-password>
+10. If all stratos products are installed on the same node, update /etc/hosts file with a set of domain/host names mapping each product. These values
+ should be updated on conf/setup.conf file. If they are installed on different nodes use actual hostnames.
+
+ <ip-address> stratos.apache.org # stratos domain
+ <ip-address> mb.stratos.apache.org # message broker hostname
+ <ip-address> cc.stratos.apache.org # cloud controller hostname
+ <ip-address> sc.stratos.apache.org # stratos controller hostname
+ <ip-address> elb.stratos.apache.org # elastic load balancer hostname
+ <ip-address> agent.stratos.apache.org # agent hostname
+
+11. Update ./conf/setup.conf and configure settings.
+
+12. Run setup.sh as root to install.
+
+ sudo ./setup.sh -p "<product-list>"
+ <product-list> could be defined as "cc sc elb agent" or any other combination according to the deployment configuration.
+ Example:
+ sudo ./setup.sh -p "all"
+
+ If you need to clean the setup run bellow command:
+ sudo ./clean.sh -u <mysql-username> -p <mysql-password>
---------------------------------------------------------------------------
Thanks for using Apache Stratos
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/cartridges/ec2/ec2-mysql.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/ec2/ec2-mysql.xml b/tools/stratos-installer/cartridges/ec2/ec2-mysql.xml
new file mode 100644
index 0000000..f13f384
--- /dev/null
+++ b/tools/stratos-installer/cartridges/ec2/ec2-mysql.xml
@@ -0,0 +1,36 @@
+<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+ <cartridges>
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="mysql" host="mysql.STRATOS_DOMAIN" provider="data" version="5.5" multiTenant="false">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+
+ <displayName>EC2 MySQL</displayName>
+ <description>EC2 MySQL Cartridge</description>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="ec2" >
+ <imageId>region/imageid</imageId>
+ <property name="keyPair" value="key-pair"/>
+ <property name="instanceType" value="instance-type"/>
+ <property name="securityGroups" value="security-groups"/>
+ </iaasProvider>
+ <deployment baseDir="/var/www">
+ <dir>public=copy#app#files#here</dir>
+ <dir>simplesamlphp=copy#saml#libraries#here</dir>
+ </deployment>
+ <portMapping>
+ <http port="80" proxyPort="8280"/>
+ <https port="443" proxyPort="8243"/>
+ </portMapping>
+ <property name="sshPort" value="22"/>
+ <property name="dataPort" value="3306"/>
+ <!--<appTypes>
+ <property name="axis2services" isBothmapping="false"/>
+ <property name="webapps" isBothmapping="true"/>
+ <property name="jaxwebapps" isBothmapping="true"/>
+ <property name="jaggeryapps" isBothmapping="true"/>
+ </appTypes>-->
+ </cartridge>
+ </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/cartridges/ec2/ec2-php.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/ec2/ec2-php.xml b/tools/stratos-installer/cartridges/ec2/ec2-php.xml
new file mode 100644
index 0000000..698afbd
--- /dev/null
+++ b/tools/stratos-installer/cartridges/ec2/ec2-php.xml
@@ -0,0 +1,35 @@
+<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+ <cartridges>
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="php" host="php.STRATOS_DOMAIN" provider="zend-provider" version="5.5" multiTenant="false">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+
+ <displayName>EC2 PHP</displayName>
+ <description>EC2 PHP Cartridge</description>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="ec2" >
+ <imageId>region/image-id</imageId>
+ <property name="keyPair" value="key-pair"/>
+ <property name="instanceType" value="instance-type"/>
+ <property name="securityGroups" value="security-groups"/>
+ </iaasProvider>
+ <deployment baseDir="/var/www">
+ <dir>www=copy#app#files#here</dir>
+ <dir>simplesamlphp=copy#saml#libraries#here</dir>
+ <dir>sql=copy#saml#libraries#here</dir>
+ </deployment>
+ <portMapping>
+ <http port="80" proxyPort="8280"/>
+ <https port="443" proxyPort="8243"/>
+ </portMapping>
+ <!--<appTypes>
+ <property name="axis2services" isBothmapping="false"/>
+ <property name="webapps" isBothmapping="true"/>
+ <property name="jaxwebapps" isBothmapping="true"/>
+ <property name="jaggeryapps" isBothmapping="true"/>
+ </appTypes>-->
+ </cartridge>
+ </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/cartridges/ec2/ec2-tomcat.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/ec2/ec2-tomcat.xml b/tools/stratos-installer/cartridges/ec2/ec2-tomcat.xml
new file mode 100644
index 0000000..a43eb7f
--- /dev/null
+++ b/tools/stratos-installer/cartridges/ec2/ec2-tomcat.xml
@@ -0,0 +1,35 @@
+<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
+ <cartridges>
+ <!-- You can have 1..n cartridge elements. -->
+ <cartridge type="tomcat" host="tomcat.STRATOS_DOMAIN" provider="apache" version="7" multiTenant="false">
+ <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
+ specified under iaasProvider child elements of cartridge element. -->
+
+ <displayName>EC2 Tomcat</displayName>
+ <description>EC2 Tomcat Cartridge</description>
+ <!-- A cartridge element should add a reference to an existing IaaS provider (specified
+ in the above <iaasProviders> section) or it can create a completely new IaaS
+ Provider (which should have a unique "type" attribute. -->
+ <iaasProvider type="ec2" >
+ <imageId>region/image-id</imageId>
+ <property name="keyPair" value="key-pair"/>
+ <property name="securityGroups" value="security-groups"/>
+ <property name="instanceType" value="instance-type"/>
+ </iaasProvider>
+ <deployment baseDir="/var/lib/tomcat7/webapps">
+ <dir>www=copy#app#files#here</dir>
+ <dir>simplesamlphp=copy#saml#libraries#here</dir>
+ <dir>sql=copy#saml#libraries#here</dir>
+ </deployment>
+ <portMapping>
+ <http port="8080" proxyPort="8280"/>
+ <https port="8443" proxyPort="8243"/>
+ </portMapping>
+ <!--<appTypes>
+ <property name="axis2services" isBothmapping="false"/>
+ <property name="webapps" isBothmapping="true"/>
+ <property name="jaxwebapps" isBothmapping="true"/>
+ <property name="jaggeryapps" isBothmapping="true"/>
+ </appTypes>-->
+ </cartridge>
+ </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/cartridges/ec2/ec2_mysql.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/ec2/ec2_mysql.xml b/tools/stratos-installer/cartridges/ec2/ec2_mysql.xml
deleted file mode 100644
index f13f384..0000000
--- a/tools/stratos-installer/cartridges/ec2/ec2_mysql.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="mysql" host="mysql.STRATOS_DOMAIN" provider="data" version="5.5" multiTenant="false">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
-
- <displayName>EC2 MySQL</displayName>
- <description>EC2 MySQL Cartridge</description>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="ec2" >
- <imageId>region/imageid</imageId>
- <property name="keyPair" value="key-pair"/>
- <property name="instanceType" value="instance-type"/>
- <property name="securityGroups" value="security-groups"/>
- </iaasProvider>
- <deployment baseDir="/var/www">
- <dir>public=copy#app#files#here</dir>
- <dir>simplesamlphp=copy#saml#libraries#here</dir>
- </deployment>
- <portMapping>
- <http port="80" proxyPort="8280"/>
- <https port="443" proxyPort="8243"/>
- </portMapping>
- <property name="sshPort" value="22"/>
- <property name="dataPort" value="3306"/>
- <!--<appTypes>
- <property name="axis2services" isBothmapping="false"/>
- <property name="webapps" isBothmapping="true"/>
- <property name="jaxwebapps" isBothmapping="true"/>
- <property name="jaggeryapps" isBothmapping="true"/>
- </appTypes>-->
- </cartridge>
- </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/cartridges/ec2/ec2_php.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/ec2/ec2_php.xml b/tools/stratos-installer/cartridges/ec2/ec2_php.xml
deleted file mode 100644
index 698afbd..0000000
--- a/tools/stratos-installer/cartridges/ec2/ec2_php.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="php" host="php.STRATOS_DOMAIN" provider="zend-provider" version="5.5" multiTenant="false">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
-
- <displayName>EC2 PHP</displayName>
- <description>EC2 PHP Cartridge</description>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="ec2" >
- <imageId>region/image-id</imageId>
- <property name="keyPair" value="key-pair"/>
- <property name="instanceType" value="instance-type"/>
- <property name="securityGroups" value="security-groups"/>
- </iaasProvider>
- <deployment baseDir="/var/www">
- <dir>www=copy#app#files#here</dir>
- <dir>simplesamlphp=copy#saml#libraries#here</dir>
- <dir>sql=copy#saml#libraries#here</dir>
- </deployment>
- <portMapping>
- <http port="80" proxyPort="8280"/>
- <https port="443" proxyPort="8243"/>
- </portMapping>
- <!--<appTypes>
- <property name="axis2services" isBothmapping="false"/>
- <property name="webapps" isBothmapping="true"/>
- <property name="jaxwebapps" isBothmapping="true"/>
- <property name="jaggeryapps" isBothmapping="true"/>
- </appTypes>-->
- </cartridge>
- </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/cartridges/ec2/ec2_tomcat.xml
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/cartridges/ec2/ec2_tomcat.xml b/tools/stratos-installer/cartridges/ec2/ec2_tomcat.xml
deleted file mode 100644
index b2c0db0..0000000
--- a/tools/stratos-installer/cartridges/ec2/ec2_tomcat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- Use below section to specify properties that are needed in order to start Cartridges. -->
- <cartridges>
- <!-- You can have 1..n cartridge elements. -->
- <cartridge type="tomcat" host="tomcat.stratos.apache.org" provider="apache" version="7" multiTenant="false">
- <!-- cartridge element can have 0..n properties, and they'll be overwritten by the properties
- specified under iaasProvider child elements of cartridge element. -->
-
- <displayName>EC2 Tomcat</displayName>
- <description>EC2 Tomcat Cartridge</description>
- <!-- A cartridge element should add a reference to an existing IaaS provider (specified
- in the above <iaasProviders> section) or it can create a completely new IaaS
- Provider (which should have a unique "type" attribute. -->
- <iaasProvider type="ec2" >
- <imageId>region/image-id</imageId>
- <property name="keyPair" value="key-pair"/>
- <property name="securityGroups" value="security-groups"/>
- <property name="instanceType" value="instance-type"/>
- </iaasProvider>
- <deployment baseDir="/var/lib/tomcat7/webapps">
- <dir>www=copy#app#files#here</dir>
- <dir>simplesamlphp=copy#saml#libraries#here</dir>
- <dir>sql=copy#saml#libraries#here</dir>
- </deployment>
- <portMapping>
- <http port="8080" proxyPort="8280"/>
- <https port="8443" proxyPort="8243"/>
- </portMapping>
- <!--<appTypes>
- <property name="axis2services" isBothmapping="false"/>
- <property name="webapps" isBothmapping="true"/>
- <property name="jaxwebapps" isBothmapping="true"/>
- <property name="jaggeryapps" isBothmapping="true"/>
- </appTypes>-->
- </cartridge>
- </cartridges>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/clean.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/clean.sh b/tools/stratos-installer/clean.sh
index 15a161f..be57522 100755
--- a/tools/stratos-installer/clean.sh
+++ b/tools/stratos-installer/clean.sh
@@ -34,17 +34,17 @@ function help {
echo ""
echo "Clean the host machine where one or more of the Stratos2 servers are run."
echo "usage:"
- echo "clean.sh -a<mysql username> -b<mysql password>"
+ echo "clean.sh -u <mysql username> -p <mysql password>"
echo ""
}
-while getopts a:b: opts
+while getopts u:p: opts
do
case $opts in
- a)
+ u)
mysql_user=${OPTARG}
;;
- b)
+ p)
mysql_pass=${OPTARG}
;;
*)
@@ -57,7 +57,7 @@ done
function helpclean {
echo ""
echo "usage:"
- echo "clean.sh -a<mysql username> -b<mysql password>"
+ echo "clean.sh -u <mysql username> -p <mysql password>"
echo ""
}
@@ -78,7 +78,7 @@ function clean_validate {
clean_validate
-read -p "Please confirm that you want to remove stratos databases, installed content and logs [y/n] " answer
+read -p "Please confirm that you want to remove stratos databases, servers and logs [y/n] " answer
if [[ $answer != y ]] ; then
exit 1
fi
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 0552e85..964728e 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -48,7 +48,7 @@ export mysql_connector_jar=$stratos_pack_path/"mysql-connector-java-5.1.25.jar"
# MB configuration
# ----------------------------------------------------------------------------
-export mb_hostname=stratos.apache.org
+export mb_hostname=mb.stratos.apache.org
export mb_listen_port="5677"
@@ -81,15 +81,6 @@ export sc_ip=$hostip
export agent_ip=$hostip
-# Billing configuration
-# ----------------------------------------------------------------------------
-#export billing_db_hostanme="stratos.apache.org"
-#export billing_db_username="root"
-#export billing_db_password="root"
-#export billing_db_port="3306"
-#export billing_db_schema="billing"
-
-
# Git repo cofiguration. This will be needed only if you need to setup an internal git repo.
# ----------------------------------------------------------------------------
export git_user="git"
@@ -108,7 +99,7 @@ export cc_pack=$stratos_pack_path/"apache-stratos-cc-3.0.0-SNAPSHOT.zip"
export cc_https_port="9444"
export cc_port_offset=1
-export cc_hostname="stratos.apache.org"
+export cc_hostname="cc.stratos.apache.org"
export mb_cassandra_host="localhost"
export mb_cassandra_port="9161"
@@ -118,7 +109,7 @@ export mb_cassandra_port="9161"
export elb_path=$stratos_path/"apache-stratos-elb-3.0.0-SNAPSHOT"
export elb_pack=$stratos_pack_path/"apache-stratos-elb-3.0.0-SNAPSHOT.zip"
-export elb_hostname="stratos.apache.org"
+export elb_hostname="elb.stratos.apache.org"
export enable_autoscaler=true
export enable_embedded_autoscaler=false
export elb_port_offset=0
@@ -131,7 +122,7 @@ export elb_port="9443"
export agent_path=$stratos_path/"apache-stratos-agent-3.0.0-SNAPSHOT"
export agent_pack=$stratos_pack_path/"apache-stratos-agent-3.0.0-SNAPSHOT.zip"
export agent_clustering_port="4025"
-export agent_hostname="stratos.apache.org"
+export agent_hostname="agent.stratos.apache.org"
export agent_http_port="9767"
export agent_https_port="9447"
export agent_port_offset=4
@@ -151,6 +142,9 @@ export agent_port_offset=4
# IaaS Providers
# ----------------------------------------------------------------------------
+# Set <iaas-name>_provider_enabled parameter to true to enable desired IaaS. A hybrid cloud could be
+# created using multiple IaaSs.
+
# EC2
export ec2_provider_enabled=false
export ec2_identity=""
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/ec2-cartridge.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/ec2-cartridge.sh b/tools/stratos-installer/ec2-cartridge.sh
index 31aef96..a35fbf0 100755
--- a/tools/stratos-installer/ec2-cartridge.sh
+++ b/tools/stratos-installer/ec2-cartridge.sh
@@ -54,7 +54,7 @@ fi
pushd $cc_path
-echo "Updating repository/deployment/server/cartridges/ec2_mysql.xml" | tee $LOG
+echo "Updating repository/deployment/server/cartridges/ec2-mysql.xml" | tee $LOG
# <iaasProvider type="openstack" >
# <imageId>nova/d6e5dbe9-f781-460d-b554-23a133a887cd</imageId>
# <property name="keyPair" value="stratos-demo"/>
@@ -64,23 +64,23 @@ echo "Updating repository/deployment/server/cartridges/ec2_mysql.xml" | tee $LOG
# </iaasProvider>
-cp -f repository/deployment/server/cartridges/ec2_mysql.xml repository/deployment/server/cartridges/ec2_mysql.xml.orig
-cat repository/deployment/server/cartridges/ec2_mysql.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$ec2_keypair_name\"/>@g" > repository/deployment/server/cartridges/ec2_mysql.xml
+cp -f repository/deployment/server/cartridges/ec2-mysql.xml repository/deployment/server/cartridges/ec2-mysql.xml.orig
+cat repository/deployment/server/cartridges/ec2-mysql.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$ec2_keypair_name\"/>@g" > repository/deployment/server/cartridges/ec2-mysql.xml
-cp -f repository/deployment/server/cartridges/ec2_mysql.xml repository/deployment/server/cartridges/ec2_mysql.xml.orig
-cat repository/deployment/server/cartridges/ec2_mysql.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$ec2_instance_type\"/>@g" > repository/deployment/server/cartridges/ec2_mysql.xml
+cp -f repository/deployment/server/cartridges/ec2-mysql.xml repository/deployment/server/cartridges/ec2-mysql.xml.orig
+cat repository/deployment/server/cartridges/ec2-mysql.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$ec2_instance_type\"/>@g" > repository/deployment/server/cartridges/ec2-mysql.xml
-cp -f repository/deployment/server/cartridges/ec2_mysql.xml repository/deployment/server/cartridges/ec2_mysql.xml.orig
-cat repository/deployment/server/cartridges/ec2_mysql.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$ec2_security_groups\"/>@g" > repository/deployment/server/cartridges/ec2_mysql.xml
+cp -f repository/deployment/server/cartridges/ec2-mysql.xml repository/deployment/server/cartridges/ec2-mysql.xml.orig
+cat repository/deployment/server/cartridges/ec2-mysql.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$ec2_security_groups\"/>@g" > repository/deployment/server/cartridges/ec2-mysql.xml
-cp -f repository/deployment/server/cartridges/ec2_mysql.xml repository/deployment/server/cartridges/ec2_mysql.xml.orig
-cat repository/deployment/server/cartridges/ec2_mysql.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$ec2_region/$ec2_mysql_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/ec2_mysql.xml
+cp -f repository/deployment/server/cartridges/ec2-mysql.xml repository/deployment/server/cartridges/ec2-mysql.xml.orig
+cat repository/deployment/server/cartridges/ec2-mysql.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$ec2_region/$ec2_mysql_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/ec2-mysql.xml
-cp -f repository/deployment/server/cartridges/ec2_mysql.xml repository/deployment/server/cartridges/ec2_mysql.xml.orig
-cat repository/deployment/server/cartridges/ec2_mysql.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/deployment/server/cartridges/ec2_mysql.xml
+cp -f repository/deployment/server/cartridges/ec2-mysql.xml repository/deployment/server/cartridges/ec2-mysql.xml.orig
+cat repository/deployment/server/cartridges/ec2-mysql.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/deployment/server/cartridges/ec2-mysql.xml
-echo "Updating repository/deployment/server/cartridges/ec2_php.xml" | tee $LOG
+echo "Updating repository/deployment/server/cartridges/ec2-php.xml" | tee $LOG
# <iaasProvider type="openstack" >
# <imageId>nova/250cd0bb-96a3-4ce8-bec8-7f9c1efea1e6</imageId>
# <property name="keyPair" value="stratos-demo"/>
@@ -89,23 +89,23 @@ echo "Updating repository/deployment/server/cartridges/ec2_php.xml" | tee $LOG
# <!--<property name="payload" value="resources/as.txt"/>-->
# </iaasProvider>
-cp -f repository/deployment/server/cartridges/ec2_php.xml repository/deployment/server/cartridges/ec2_php.xml.orig
-cat repository/deployment/server/cartridges/ec2_php.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$ec2_keypair_name\"/>@g" > repository/deployment/server/cartridges/ec2_php.xml
+cp -f repository/deployment/server/cartridges/ec2-php.xml repository/deployment/server/cartridges/ec2-php.xml.orig
+cat repository/deployment/server/cartridges/ec2-php.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$ec2_keypair_name\"/>@g" > repository/deployment/server/cartridges/ec2-php.xml
-cp -f repository/deployment/server/cartridges/ec2_php.xml repository/deployment/server/cartridges/ec2_php.xml.orig
-cat repository/deployment/server/cartridges/ec2_php.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$ec2_instance_type\"/>@g" > repository/deployment/server/cartridges/ec2_php.xml
+cp -f repository/deployment/server/cartridges/ec2-php.xml repository/deployment/server/cartridges/ec2-php.xml.orig
+cat repository/deployment/server/cartridges/ec2-php.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$ec2_instance_type\"/>@g" > repository/deployment/server/cartridges/ec2-php.xml
-cp -f repository/deployment/server/cartridges/ec2_php.xml repository/deployment/server/cartridges/ec2_php.xml.orig
-cat repository/deployment/server/cartridges/ec2_php.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$ec2_security_groups\"/>@g" > repository/deployment/server/cartridges/ec2_php.xml
+cp -f repository/deployment/server/cartridges/ec2-php.xml repository/deployment/server/cartridges/ec2-php.xml.orig
+cat repository/deployment/server/cartridges/ec2-php.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$ec2_security_groups\"/>@g" > repository/deployment/server/cartridges/ec2-php.xml
-cp -f repository/deployment/server/cartridges/ec2_php.xml repository/deployment/server/cartridges/ec2_php.xml.orig
-cat repository/deployment/server/cartridges/ec2_php.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$ec2_region/$ec2_php_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/ec2_php.xml
+cp -f repository/deployment/server/cartridges/ec2-php.xml repository/deployment/server/cartridges/ec2-php.xml.orig
+cat repository/deployment/server/cartridges/ec2-php.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$ec2_region/$ec2_php_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/ec2-php.xml
-cp -f repository/deployment/server/cartridges/ec2_php.xml repository/deployment/server/cartridges/ec2_php.xml.orig
-cat repository/deployment/server/cartridges/ec2_php.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/deployment/server/cartridges/ec2_php.xml
+cp -f repository/deployment/server/cartridges/ec2-php.xml repository/deployment/server/cartridges/ec2-php.xml.orig
+cat repository/deployment/server/cartridges/ec2-php.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/deployment/server/cartridges/ec2-php.xml
-echo "Updating repository/deployment/server/cartridges/ec2_tomcat.xml" | tee $LOG
+echo "Updating repository/deployment/server/cartridges/ec2-tomcat.xml" | tee $LOG
# <iaasProvider type="openstack" >
# <imageId>RegionOne/9701eb18-d7e1-4a53-a2bf-a519899d451c</imageId>
# <property name="keyPair" value="manula_openstack"/>
@@ -114,19 +114,19 @@ echo "Updating repository/deployment/server/cartridges/ec2_tomcat.xml" | tee $LO
# <!--<property name="payload" value="resources/as.txt"/>-->
# </iaasProvider>
-cp -f repository/deployment/server/cartridges/ec2_tomcat.xml repository/deployment/server/cartridges/ec2_tomcat.xml.orig
-cat repository/deployment/server/cartridges/ec2_tomcat.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$ec2_keypair_name\"/>@g" > repository/deployment/server/cartridges/ec2_tomcat.xml
+cp -f repository/deployment/server/cartridges/ec2-tomcat.xml repository/deployment/server/cartridges/ec2-tomcat.xml.orig
+cat repository/deployment/server/cartridges/ec2-tomcat.xml.orig | sed -e "s@<property name=\"keyPair\" value=\"*.*\"/>@<property name=\"keyPair\" value=\"$ec2_keypair_name\"/>@g" > repository/deployment/server/cartridges/ec2-tomcat.xml
-cp -f repository/deployment/server/cartridges/ec2_tomcat.xml repository/deployment/server/cartridges/ec2_tomcat.xml.orig
-cat repository/deployment/server/cartridges/ec2_tomcat.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$ec2_instance_type\"/>@g" > repository/deployment/server/cartridges/ec2_tomcat.xml
+cp -f repository/deployment/server/cartridges/ec2-tomcat.xml repository/deployment/server/cartridges/ec2-tomcat.xml.orig
+cat repository/deployment/server/cartridges/ec2-tomcat.xml.orig | sed -e "s@<property name=\"instanceType\" value=\"*.*\"/>@<property name=\"instanceType\" value=\"$ec2_instance_type\"/>@g" > repository/deployment/server/cartridges/ec2-tomcat.xml
-cp -f repository/deployment/server/cartridges/ec2_tomcat.xml repository/deployment/server/cartridges/ec2_tomcat.xml.orig
-cat repository/deployment/server/cartridges/ec2_tomcat.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$ec2_security_groups\"/>@g" > repository/deployment/server/cartridges/ec2_tomcat.xml
+cp -f repository/deployment/server/cartridges/ec2-tomcat.xml repository/deployment/server/cartridges/ec2-tomcat.xml.orig
+cat repository/deployment/server/cartridges/ec2-tomcat.xml.orig | sed -e "s@<property name=\"securityGroups\" value=\"*.*\"/>@<property name=\"securityGroups\" value=\"$ec2_security_groups\"/>@g" > repository/deployment/server/cartridges/ec2-tomcat.xml
-cp -f repository/deployment/server/cartridges/ec2_tomcat.xml repository/deployment/server/cartridges/ec2_tomcat.xml.orig
-cat repository/deployment/server/cartridges/ec2_tomcat.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$ec2_region/$ec2_tomcat_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/ec2_tomcat.xml
+cp -f repository/deployment/server/cartridges/ec2-tomcat.xml repository/deployment/server/cartridges/ec2-tomcat.xml.orig
+cat repository/deployment/server/cartridges/ec2-tomcat.xml.orig | sed -e "s@<imageId>*.*</imageId>@<imageId>$ec2_region/$ec2_tomcat_cartridge_image_id</imageId>@g" > repository/deployment/server/cartridges/ec2-tomcat.xml
-cp -f repository/deployment/server/cartridges/ec2_tomcat.xml repository/deployment/server/cartridges/ec2_tomcat.xml.orig
-cat repository/deployment/server/cartridges/ec2_tomcat.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/deployment/server/cartridges/ec2_tomcat.xml
+cp -f repository/deployment/server/cartridges/ec2-tomcat.xml repository/deployment/server/cartridges/ec2-tomcat.xml.orig
+cat repository/deployment/server/cartridges/ec2-tomcat.xml.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/deployment/server/cartridges/ec2-tomcat.xml
popd # cc_path
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7b141e3f/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index be3a579..55fc641 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -42,14 +42,15 @@ enable_internal_git=false
function help {
echo ""
echo "Usage:"
- echo "setup.sh -u<host username> -p\"<product list>\""
+ echo "setup.sh -u <host username> -p \"<product list>\""
echo "Example:"
echo "sudo ./setup.sh -p \"cc elb\""
echo "sudo ./setup.sh -p \"all\""
echo ""
+ echo "-u: <host username> The login user of the host."
echo "-p: <product list> Apache Stratos products to be installed on this node. Provide one or more names of the servers."
echo " The available servers are cc, elb, agent, sc or all. 'all' means you need to setup all servers in this machine. Default is all"
- echo "-g: <enable_internal_git true|false> Whether enable internal git repo for Stratos2. Default is false"
+ echo "-g: <enable_internal_git> true|false Whether enable internal git repo for Stratos2. Default is false"
echo ""
}