You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/05/12 18:34:27 UTC
stratos git commit: STRATOS-1390 - Update hard-coded hostname/ip in
cartridge-config.properties of stratos-installer
Repository: stratos
Updated Branches:
refs/heads/master e99291b8d -> c29b736b4
STRATOS-1390 - Update hard-coded hostname/ip in cartridge-config.properties of stratos-installer
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c29b736b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c29b736b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c29b736b
Branch: refs/heads/master
Commit: c29b736b448bcd649fccb35e12e90e21be2ca0cf
Parents: e99291b
Author: lasinducharith <la...@gmail.com>
Authored: Tue May 12 22:03:43 2015 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Tue May 12 22:03:43 2015 +0530
----------------------------------------------------------------------
tools/stratos-installer/setup.sh | 1 +
tools/stratos-installer/templates/cartridge-config.properties | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c29b736b/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 36cf0b4..6a764ec 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -413,6 +413,7 @@ function sm_setup() {
echo "In repository/conf/cartridge-config.properties"
${SED} -i "s@CC_HOSTNAME:CC_HTTPS_PORT@$cc_hostname:$sm_cc_https_port@g" repository/conf/cartridge-config.properties
${SED} -i "s@AS_HOSTNAME:AS_HTTPS_PORT@$as_hostname:$sm_as_https_port@g" repository/conf/cartridge-config.properties
+ ${SED} -i "s@SM_HOSTNAME:SM_HTTPS_PORT@$sm_hostname:$sm_https_port@g" repository/conf/cartridge-config.properties
${SED} -i "s@PUPPET_IP@$puppet_ip@g" repository/conf/cartridge-config.properties
${SED} -i "s@PUPPET_HOSTNAME@$puppet_hostname@g" repository/conf/cartridge-config.properties
${SED} -i "s@PUPPET_ENV@$puppet_environment@g" repository/conf/cartridge-config.properties
http://git-wip-us.apache.org/repos/asf/stratos/blob/c29b736b/tools/stratos-installer/templates/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/templates/cartridge-config.properties b/tools/stratos-installer/templates/cartridge-config.properties
index fb11f48..bfe79bf 100644
--- a/tools/stratos-installer/templates/cartridge-config.properties
+++ b/tools/stratos-installer/templates/cartridge-config.properties
@@ -22,7 +22,7 @@
# Configuration properties
autoscaler.service.url=https://AS_HOSTNAME:AS_HTTPS_PORT/services/AutoscalerService/
-stratos.manager.service.url=https://localhost:9443/services/StratosManagerService/
+stratos.manager.service.url=https://SM_HOSTNAME:SM_HTTPS_PORT/services/StratosManagerService/
cloud.controller.service.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/
puppet.ip=PUPPET_IP
puppet.hostname=PUPPET_HOSTNAME