Updated Branches: refs/heads/master d387d640f -> da3cd1dcf
Update Stratos Installer to support Cloud Controller Signed-off-by: Imesh Gunaratne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/da3cd1dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/da3cd1dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/da3cd1dc Branch: refs/heads/master Commit: da3cd1dcfb4743032811bcf43ddd550386a4f41c Parents: d387d64 Author: Dinesh Bandara <[email protected]> Authored: Tue Dec 3 11:41:56 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Dec 3 12:01:07 2013 +0530 ---------------------------------------------------------------------- tools/stratos-installer/conf/setup.conf | 4 +- .../config/cc/repository/conf/jndi.properties | 4 ++ tools/stratos-installer/setup.sh | 68 ++------------------ tools/stratos-installer/start-servers.sh | 2 +- 4 files changed, 14 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/da3cd1dc/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index 0315940..551b467 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -101,9 +101,9 @@ export axis2c_pack="axis2-1.6.2-bin.zip" export cc_path=$stratos_path/"apache-stratos-cc-4.0.0-SNAPSHOT" export cc_pack=$stratos_pack_path/"apache-stratos-cc-4.0.0-SNAPSHOT.zip" -export cc_https_port="9444" -export cc_port_offset=1 export cc_hostname="cc.$stratos_domain" +export cc_port_offset=1 +export cc_https_port=$((9443 + $cc_port_offset)) export mb_cassandra_host="localhost" export mb_cassandra_port="9161" http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/da3cd1dc/tools/stratos-installer/config/cc/repository/conf/jndi.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/cc/repository/conf/jndi.properties b/tools/stratos-installer/config/cc/repository/conf/jndi.properties new file mode 100644 index 0000000..94d3fc7 --- /dev/null +++ b/tools/stratos-installer/config/cc/repository/conf/jndi.properties @@ -0,0 +1,4 @@ +java.naming.factory.initial=org.wso2.andes.jndi.PropertiesFileInitialContextFactory +connectionfactoryName=topicConnectionfactory +connectionfactory.topicConnectionfactory=amqp://admin:admin@clientID/carbon?brokerlist='tcp://MB_HOSTNAME:MB_LISTEN_PORT'&reconnect='true' + http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/da3cd1dc/tools/stratos-installer/setup.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh index 6b2b494..c77de89 100755 --- a/tools/stratos-installer/setup.sh +++ b/tools/stratos-installer/setup.sh @@ -519,60 +519,23 @@ if [[ $sc = "true" ]]; then fi #End SC server installation +# ------------------------------------------------ # Setup CC # ------------------------------------------------ if [[ $cc = "true" ]]; then echo "Setup CC" >> $LOG echo "Configuring the Cloud Controller" + echo "Creating payload directory ... " >> $LOG if [[ ! -d $cc_path/repository/resources/payload ]]; then mkdir -p $cc_path/repository/resources/payload fi - #cp -f ./config/cc/bin/stratos.sh $cc_path/bin/ cp -f ./config/cc/repository/conf/cloud-controller.xml $cc_path/repository/conf/ cp -f ./config/cc/repository/conf/carbon.xml $cc_path/repository/conf/ + cp -f ./config/cc/repository/conf/jndi.properties $cc_path/repository/conf/ - #MB specific file copying - #cp -f ./config/cc/repository/conf/advanced/qpid-virtualhosts.xml $cc_path/repository/conf/advanced/ - #cp -f ./config/cc/repository/conf/carbon.xml $cc_path/repository/conf/ - #End MB specific file copying - - - # Setup IaaS providers - # ------------------------------------------------ - # <iaasProviders> - # <!--iaasProvider type="ec2" name="ec2 specific details"> - # <className>org.wso2.carbon.stratos.cloud.controller.iaases.AWSEC2Iaas</className> - # <provider>aws-ec2</provider> - # <identity svns:secretAlias="elastic.scaler.openstack.identity">dhsaghfdal</identity> - # <credential svns:secretAlias="elastic.scaler.openstack.credential">jdkjaskd</credential> - # <scaleUpOrder>1</scaleUpOrder> - # <scaleDownOrder>2</scaleDownOrder> - # <property name="jclouds.ec2.ami-query" value="owner-id=XX-XX-XX;state=available;image-type=machine"/> - # <property name="availabilityZone" value="us-east-1c"/> - # <property name="securityGroups" value="manager,cep,mb,default"/> - # <property name="instanceType" value="m1.large"/> - # <property name="keyPair" value="nirmal-key"/> - # <imageId>us-east-1/ami-52409a3b</imageId> - # </iaasProvider--> - # - # <iaasProvider type="openstack" name="openstack specific details"> - # <className>org.wso2.carbon.stratos.cloud.controller.iaases.OpenstackNovaIaas</className> - # <provider>openstack-nova</provider> - # <identity svns:secretAlias="cloud.controller.openstack.identity">demo:demo</identity> - # <credential svns:secretAlias="cloud.controller.openstack.credential">openstack</credential> - # <property name="jclouds.endpoint" value="http://192.168.16.20:5000/"; /> - # <property name="jclouds.openstack-nova.auto-create-floating-ips" value="false"/> - # <property name="jclouds.api-version" value="2.0/" /> - # <scaleUpOrder>2</scaleUpOrder> - # <scaleDownOrder>3</scaleDownOrder> - # <property name="X" value="x" /> - # <property name="Y" value="y" /> - # <imageId>nova/dab37f0e-cf6f-4812-86fc-733acf22d5e6</imageId> - # </iaasProvider> - # </iaasProviders> - + echo "In repository/conf/cloud-controller.xml" if [[ $ec2_provider_enabled = true ]]; then ./ec2.sh fi @@ -587,28 +550,11 @@ if [[ $cc = "true" ]]; then echo "In repository/conf/carbon.xml" cp -f repository/conf/carbon.xml repository/conf/carbon.xml.orig - cat repository/conf/carbon.xml.orig | sed -e "s@BAM_HOSTNAME:BAM_PORT@$bam_hostname:$bam_port@g" > repository/conf/carbon.xml - - #Before starting CC we need to delete - #rm ./repository/conf/service-topology.conf - #rm ./repository/conf/service-topology.conf.back - - - # Setup MB - # ------------------------------------------------------------- - #echo "Setup MB" >> $LOG - #echo "Set settings in cc/repository/conf/advanced/qpid-virtualhosts.xml" >> $LOG - #cp -f repository/conf/advanced/qpid-virtualhosts.xml repository/conf/advanced/qpid-virtualhosts.xml.orig - #cat repository/conf/advanced/qpid-virtualhosts.xml.orig | sed -e "s@MB_CASSANDRA_HOST@$mb_cassandra_host@g" > repository/conf/advanced/qpid-virtualhosts.xml - #cp -f repository/conf/advanced/qpid-virtualhosts.xml repository/conf/advanced/qpid-virtualhosts.xml.orig - #cat repository/conf/advanced/qpid-virtualhosts.xml.orig | sed -e "s@MB_CASSANDRA_PORT@$mb_cassandra_port@g" > repository/conf/advanced/qpid-virtualhosts.xml - - echo "Set settings in cc/repository/conf/carbon.xml" >> $LOG - cp -f repository/conf/carbon.xml repository/conf/carbon.xml.orig cat repository/conf/carbon.xml.orig | sed -e "s@CC_PORT_OFFSET@$cc_port_offset@g" > repository/conf/carbon.xml - #Before starting sc delete rm -rf tmp/ at mb root folder - rm -rf ./tmp + echo "In repository/conf/jndi.properties" + cp -f repository/conf/jndi.properties repository/conf/jndi.properties.orig + cat repository/conf/jndi.properties.orig | sed -e "s@MB_HOSTNAME:MB_LISTEN_PORT@$mb_hostname:$mb_listen_port@g" > repository/conf/jndi.properties popd #cc_path echo "End configuring the Cloud Controller" http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/da3cd1dc/tools/stratos-installer/start-servers.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/start-servers.sh b/tools/stratos-installer/start-servers.sh index 9fa4c45..9d3f194 100755 --- a/tools/stratos-installer/start-servers.sh +++ b/tools/stratos-installer/start-servers.sh @@ -113,7 +113,7 @@ if [[ $cc = "true" ]]; then echo ${cc_path} echo "Starting CC server ..." >> $LOG - nohup ${cc_path}/bin/stratos.sh -DportOffset=$cc_port_offset & + nohup ${cc_path}/bin/stratos.sh & echo "CC server started" >> $LOG sleep $SLEEP sleep $SLEEP
