You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/08/08 05:58:41 UTC
git commit: Renamed s2_ip constant to stratos_ip and removed
hosts.erb file
Updated Branches:
refs/heads/master 5c97f5a88 -> a4da63266
Renamed s2_ip constant to stratos_ip and removed hosts.erb file
Signed-off-by: Isuru Perera <is...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a4da6326
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a4da6326
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a4da6326
Branch: refs/heads/master
Commit: a4da6326669561edea751d279d7be4fcbd77ef25
Parents: 5c97f5a
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Wed Aug 7 19:00:11 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Thu Aug 8 09:28:22 2013 +0530
----------------------------------------------------------------------
.../src/conf/cartridge-config.properties | 12 ++++++------
.../resources/conf/cartridge-config.properties | 12 ++++++------
.../ec2-demo-setup/tempconfigs/agent.properties | 6 +++---
tools/ec2-demo-setup/tempconfigs/hosts.erb | 19 -------------------
4 files changed, 15 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4da6326/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties b/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
index b495014..83b9641 100644
--- a/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
+++ b/components/org.apache.stratos.adc.mgt/src/conf/cartridge-config.properties
@@ -1,11 +1,11 @@
# Configuration properties
-sc.ip=s2_ip
+sc.ip=stratos_ip
autoscalerService.url=https://cc.wso2.com:9444/services/CloudControllerService/
autoscaler.time.out=190000
-cartridge.agent.epr=https://s2_ip:9447/services/CartridgeAgentService
+cartridge.agent.epr=https://stratos_ip:9447/services/CartridgeAgentService
git.host.name=s2_hostname
-git.host.ip=s2_ip
+git.host.ip=stratos_ip
git.repo.notification.url=https://sc.wso2.com:9445/services/RepoNotificationService/
identity.server.url=https://sc.wso2.com:9447/services/RepoNotificationService/
@@ -26,13 +26,13 @@ internal.repo.password=admin
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=KEYPATH
-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/a4da6326/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
index b495014..83b9641 100644
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/src/main/resources/conf/cartridge-config.properties
@@ -1,11 +1,11 @@
# Configuration properties
-sc.ip=s2_ip
+sc.ip=stratos_ip
autoscalerService.url=https://cc.wso2.com:9444/services/CloudControllerService/
autoscaler.time.out=190000
-cartridge.agent.epr=https://s2_ip:9447/services/CartridgeAgentService
+cartridge.agent.epr=https://stratos_ip:9447/services/CartridgeAgentService
git.host.name=s2_hostname
-git.host.ip=s2_ip
+git.host.ip=stratos_ip
git.repo.notification.url=https://sc.wso2.com:9445/services/RepoNotificationService/
identity.server.url=https://sc.wso2.com:9447/services/RepoNotificationService/
@@ -26,13 +26,13 @@ internal.repo.password=admin
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=KEYPATH
-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/a4da6326/tools/ec2-demo-setup/tempconfigs/agent.properties
----------------------------------------------------------------------
diff --git a/tools/ec2-demo-setup/tempconfigs/agent.properties b/tools/ec2-demo-setup/tempconfigs/agent.properties
index b5f69b0..b3690bb 100755
--- a/tools/ec2-demo-setup/tempconfigs/agent.properties
+++ b/tools/ec2-demo-setup/tempconfigs/agent.properties
@@ -7,14 +7,14 @@ registrant.healthCheckThreadPoolSize=2000
# Clustering parameters of Cartridge agent member
clustering.membershipScheme=wka
clustering.maxRetries=5
-clustering.localMemberHost=s2_ip
+clustering.localMemberHost=stratos_ip
#clustering.localMemberBindPort=4026
clustering.localMemberPort=4025
# ELB members
-members.1.host=s2_ip
+members.1.host=stratos_ip
members.1.port=4000
# Instance State Notification Service
-adc.host=s2_ip
+adc.host=stratos_ip
adc.port=9445
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4da6326/tools/ec2-demo-setup/tempconfigs/hosts.erb
----------------------------------------------------------------------
diff --git a/tools/ec2-demo-setup/tempconfigs/hosts.erb b/tools/ec2-demo-setup/tempconfigs/hosts.erb
deleted file mode 100755
index 9106d48..0000000
--- a/tools/ec2-demo-setup/tempconfigs/hosts.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-127.0.0.1 localhost
-s2_ip demo.stratos.apache.org
-
-s2_ip git.<%= stratos_domain %>
-s2_ip sc.<%= stratos_domain %>
-s2_ip cc.<%= stratos_domain %>
-s2_ip elb.<%= stratos_domain %>
-s2_ip mysql1.<%= stratos_domain %>
-s2_ip receiver.<%= stratos_domain %>
-
-<% if s2_instance_data_multitenant == 'false' %>
-s2_ip <%= s2_instance_data_hostname %>
-<%= server_ip %> bind.<%= s2_instance_data_hostname %>
-<%= server_ip %> local.<%= s2_instance_data_hostname %>
-<% elsif s2_instance_data_multitenant == 'true' %>
-s2_ip <%= s2_instance_data_service %>.<%= stratos_domain %>
-<%= server_ip %> bind.<%= stratos_domain %>
-<%= server_ip %> local.<%= stratos_domain %>
-<% end %>