Updated Branches: refs/heads/master 047721eb5 -> 4526f8680
Changing word s2 to stratos in ec2 scripts Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4526f868 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4526f868 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4526f868 Branch: refs/heads/master Commit: 4526f8680128b56e404482f657225b7484b5d9bc Parents: 047721e Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Aug 7 10:09:43 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Aug 7 10:09:43 2013 +0530 ---------------------------------------------------------------------- tools/ec2-demo-setup/clean.sh | 4 ++-- tools/ec2-demo-setup/config.sh | 24 ++++++++++---------- .../tempconfigs/cartridge-config.properties | 16 ++++++------- .../tempconfigs/s2reponotifier.groovy | 4 ---- .../tempconfigs/stratosreponotifier.groovy | 4 ++++ 5 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4526f868/tools/ec2-demo-setup/clean.sh ---------------------------------------------------------------------- diff --git a/tools/ec2-demo-setup/clean.sh b/tools/ec2-demo-setup/clean.sh index 9ff9765..62f7f64 100755 --- a/tools/ec2-demo-setup/clean.sh +++ b/tools/ec2-demo-setup/clean.sh @@ -31,10 +31,10 @@ killall java sleep 1; echo "Cleaning up databases... " -mysqladmin -f -uroot -pg drop s2_foundation +mysqladmin -f -uroot -pg drop stratos_foundation mysqladmin -f -uroot -pg drop userstore mysqladmin -f -uroot -pg drop billing -mysql -uroot -pg </opt/resources/s2foundation_schema.sql +mysql -uroot -pg </opt/resources/stratosfoundation_schema.sql mysql -uroot -pg </opt/resources/userstore.sql mysql -uroot -pg </opt/resources/metering_mysql.sql mysql -uroot -pg </opt/resources/billing-mysql.sql http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4526f868/tools/ec2-demo-setup/config.sh ---------------------------------------------------------------------- diff --git a/tools/ec2-demo-setup/config.sh b/tools/ec2-demo-setup/config.sh index fc8f4f9..6da636a 100755 --- a/tools/ec2-demo-setup/config.sh +++ b/tools/ec2-demo-setup/config.sh @@ -66,7 +66,7 @@ fi # Getting EC2 hostname wget http://169.254.169.254/latest/meta-data/public-hostname -O /opt/public-hostname -s2_hostname=`cat /opt/public-hostname` +stratos_hostname=`cat /opt/public-hostname` #prompt for the values that are not retrieved via user-data if [[ -z $EC2_KEY_PATH ]]; then @@ -94,7 +94,7 @@ echo -n "Availability zone (default value: us-east-1c) :" read AVAILABILITY_ZONE fi if [[ -z $SECURITY_GROUP ]]; then -echo -n "Name of the EC2 security group (eg: s2demo) :" +echo -n "Name of the EC2 security group (eg: stratosdemo) :" read SECURITY_GROUP fi if [[ -z $KEY_PAIR_NAME ]]; then @@ -199,23 +199,23 @@ cp $TEMP_CONFIG_DIR/launch-params-esb $TEMP_CONFIG_DIR/launch-params-esb.tmp cp $TEMP_CONFIG_DIR/launch-params-bps $TEMP_CONFIG_DIR/launch-params-bps.tmp -sed -i "s/s2_ip/$ip/g" $TEMP_CONFIG_DIR/hosts.erb.tmp -sed -i "s/s2_ip/$ip/g" $TEMP_CONFIG_DIR/cartridge-config.properties.tmp +sed -i "s/stratos_ip/$ip/g" $TEMP_CONFIG_DIR/hosts.erb.tmp +sed -i "s/startos_ip/$ip/g" $TEMP_CONFIG_DIR/cartridge-config.properties.tmp sed -i "s@EC2KEYPATH@$EC2_KEY_PATH@g" $TEMP_CONFIG_DIR/cartridge-config.properties.tmp -sed -i "s/s2_hostname/$s2_hostname/g" $TEMP_CONFIG_DIR/cartridge-config.properties.tmp -sed -i "s/s2_ip/$ip/g" $TEMP_CONFIG_DIR/agent.properties.tmp -sed -i "s/s2_ip/$ip/g" $TEMP_CONFIG_DIR/launch-params-as.tmp -sed -i "s/s2_ip/$ip/g" $TEMP_CONFIG_DIR/launch-params-esb.tmp -sed -i "s/s2_ip/$ip/g" $TEMP_CONFIG_DIR/launch-params-bps.tmp +sed -i "s/stratos_hostname/$stratos_hostname/g" $TEMP_CONFIG_DIR/cartridge-config.properties.tmp +sed -i "s/stratos_ip/$ip/g" $TEMP_CONFIG_DIR/agent.properties.tmp +sed -i "s/stratos_ip/$ip/g" $TEMP_CONFIG_DIR/launch-params-as.tmp +sed -i "s/stratos_ip/$ip/g" $TEMP_CONFIG_DIR/launch-params-esb.tmp +sed -i "s/stratos_ip/$ip/g" $TEMP_CONFIG_DIR/launch-params-bps.tmp sed -i "s/S2DOMAIN/$DOMAIN/g" $TEMP_CONFIG_DIR/launch-params-as.tmp sed -i "s/S2DOMAIN/$DOMAIN/g" $TEMP_CONFIG_DIR/launch-params-bps.tmp sed -i "s/S2DOMAIN/$DOMAIN/g" $TEMP_CONFIG_DIR/launch-params-esb.tmp rm -rf $SERVICE_DEFINITIONS/* -cp $TEMP_CONFIG_DIR/s2reponotifier.groovy $TEMP_CONFIG_DIR/s2reponotifier.groovy.tmp -sed -i "s/s2_hostname/$s2_hostname/g" $TEMP_CONFIG_DIR/s2reponotifier.groovy.tmp -mv $TEMP_CONFIG_DIR/s2reponotifier.groovy.tmp /opt/GitBlit/data/groovy/s2reponotifier.groovy +cp $TEMP_CONFIG_DIR/stratosreponotifier.groovy $TEMP_CONFIG_DIR/stratosreponotifier.groovy.tmp +sed -i "s/stratos_hostname/$stratos_hostname/g" $TEMP_CONFIG_DIR/stratosreponotifier.groovy.tmp +mv $TEMP_CONFIG_DIR/stratosreponotifier.groovy.tmp /opt/GitBlit/data/groovy/stratosreponotifier.groovy cp $TEMP_CONFIG_DIR/appserver_service.xml $TEMP_CONFIG_DIR/appserver_service.xml.tmp http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4526f868/tools/ec2-demo-setup/tempconfigs/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/tools/ec2-demo-setup/tempconfigs/cartridge-config.properties b/tools/ec2-demo-setup/tempconfigs/cartridge-config.properties index cfa35f4..d934c18 100644 --- a/tools/ec2-demo-setup/tempconfigs/cartridge-config.properties +++ b/tools/ec2-demo-setup/tempconfigs/cartridge-config.properties @@ -1,13 +1,13 @@ -sc.ip=s2_ip +sc.ip=stratos_ip autoscalerService.url=https://cc.apache.org:9444/services/CloudControllerService/ autoscaler.time.out=190000 -cartridge.agent.epr=https://s2_ip:9447/services/CartridgeAgentService -git.host.name=s2_hostname -git.host.ip=s2_ip +cartridge.agent.epr=https://stratos_ip:9447/services/CartridgeAgentService +git.host.name=stratos_hostname +git.host.ip=stratos_ip git.repo.notification.url=https://sc.apache.org:9445/services/RepoNotificationService/ identity.server.url=https://sc.apache.org:9447/services/RepoNotificationService/ -adc.jdbc.url=jdbc:mysql://sc.apache.org:3306/s2_foundation +adc.jdbc.url=jdbc:mysql://sc.apache.org:3306/stratos_foundation adc.jdbc.username=root adc.jdbc.password=g adc.jdbc.driver=com.mysql.jdbc.Driver @@ -24,13 +24,13 @@ mb.server.ip=cc.apache.org:5673 append.script=SCRIPT_PATH/add_entry_zone_file.sh remove.script=SCRIPT_PATH/remove_entry_zone_file.sh bind.file.path=/etc/bind/db.STRATOS_DOMAIN -elb.ip=s2_ip +elb.ip=stratos_ip -bam.ip=s2_ip +bam.ip=stratos_ip bam.port=7714 max.attempts=1000 cartridge.key=EC2KEYPATH -repository.info.epr=https://s2_ip:9445/services/RepositoryInformationService +repository.info.epr=https://stratos_ip:9445/services/RepositoryInformationService http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4526f868/tools/ec2-demo-setup/tempconfigs/s2reponotifier.groovy ---------------------------------------------------------------------- diff --git a/tools/ec2-demo-setup/tempconfigs/s2reponotifier.groovy b/tools/ec2-demo-setup/tempconfigs/s2reponotifier.groovy deleted file mode 100644 index ab928cb..0000000 --- a/tools/ec2-demo-setup/tempconfigs/s2reponotifier.groovy +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env groovy - -def response = "curl -k -X POST https://localhost:9445/repo_notification -d payload={'repository':{'url':'https://s2_hostname:8443/git/${repository}'}}".execute().text -println response http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4526f868/tools/ec2-demo-setup/tempconfigs/stratosreponotifier.groovy ---------------------------------------------------------------------- diff --git a/tools/ec2-demo-setup/tempconfigs/stratosreponotifier.groovy b/tools/ec2-demo-setup/tempconfigs/stratosreponotifier.groovy new file mode 100644 index 0000000..ab928cb --- /dev/null +++ b/tools/ec2-demo-setup/tempconfigs/stratosreponotifier.groovy @@ -0,0 +1,4 @@ +#!/usr/bin/env groovy + +def response = "curl -k -X POST https://localhost:9445/repo_notification -d payload={'repository':{'url':'https://s2_hostname:8443/git/${repository}'}}".execute().text +println response
