Repository: incubator-stratos Updated Branches: refs/heads/master 4ea7f31b2 -> 8b6ce5ced
adding puppet.hostname and puppet.environment to stratos installer Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8b6ce5ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8b6ce5ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8b6ce5ce Branch: refs/heads/master Commit: 8b6ce5ced6897d03695ea0aa4f03726ea79f53d5 Parents: 4ea7f31 Author: Isuru <[email protected]> Authored: Fri Feb 21 17:57:10 2014 +0530 Committer: Isuru <[email protected]> Committed: Fri Feb 21 17:57:10 2014 +0530 ---------------------------------------------------------------------- tools/stratos-installer/conf/setup.conf | 4 ++++ .../sm/repository/conf/cartridge-config.properties | 2 ++ tools/stratos-installer/setup.sh | 14 ++++++++++++++ 3 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8b6ce5ce/tools/stratos-installer/conf/setup.conf ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf index f35df0a..d4438d3 100644 --- a/tools/stratos-installer/conf/setup.conf +++ b/tools/stratos-installer/conf/setup.conf @@ -51,6 +51,8 @@ export cc_ip="cc-ip" # Machine ip on which cc run export as_ip="as-ip" # Machine ip on which auto scalar run export sm_ip="sc-ip" # Machine ip on which sc run export puppet_ip="puppet-ip" # Machine ip on which puppet master run +export puppet_hostname="puppet-hostname" # Host name given to identify the puppet master +export puppet_environment="puppet_environment" # Name of puppet environment export cc_port_offset=1 export sm_port_offset=2 @@ -145,6 +147,8 @@ export userstore_db_user="root" export userstore_db_pass="mysql" export sm_puppet_ip=$puppet_ip +export sm_puppet_hostname=$puppet_hostname +export sm_puppet_environment=$puppet_environment export sm_mb_listen_port=$((5672 + $mb_port_offset)) export sm_cc_https_port=$((9443 + $cc_port_offset)) export sm_as_https_port=$((9443 + $as_port_offset)) http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8b6ce5ce/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties b/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties index 8bd14da..b5b91c9 100644 --- a/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties +++ b/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties @@ -24,3 +24,5 @@ autoscaler.service.url=https://AS_HOSTNAME:AS_HTTPS_PORT/services/AutoScalerService/ cloud.controller.service.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/ puppet.ip=PUPPET_IP +puppet.hostname=PUPPET_HOSTNAME +puppet.environment=PUPPET_ENV http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8b6ce5ce/tools/stratos-installer/setup.sh ---------------------------------------------------------------------- diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh index 0ab71b3..e0e3a1b 100755 --- a/tools/stratos-installer/setup.sh +++ b/tools/stratos-installer/setup.sh @@ -283,6 +283,14 @@ function sm_conf_validate { echo "Please provide valid ip for puppet master" exit 1 fi + if [[ -z $puppet_hostname ]]; then + echo "Please specify the puppet master's hostname" + exit 1 + fi + if [[ -z $puppet_environment ]]; then + echo "Please specify the relevant puppet environment" + exit 1 + fi if [[ -z $cc_hostname || -z $as_hostname ]]; then echo "Please specify valid hostname for AS and/or CC" exit 1 @@ -543,6 +551,12 @@ function sm_setup { cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig cat repository/conf/cartridge-config.properties.orig | sed -e "s@PUPPET_IP@$sm_puppet_ip@g" > repository/conf/cartridge-config.properties + cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig + cat repository/conf/cartridge-config.properties.orig | sed -e "s@PUPPET_HOSTNAME@$sm_puppet_hostname@g" > repository/conf/cartridge-config.properties + + cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig + cat repository/conf/cartridge-config.properties.orig | sed -e "s@PUPPET_ENV@$sm_puppet_environment@g" > repository/conf/cartridge-config.properties + echo "In repository/conf/datasources/master-datasources.xml" >> $LOG cp -f repository/conf/datasources/master-datasources.xml repository/conf/datasources/master-datasources.xml.orig cat repository/conf/datasources/master-datasources.xml.orig | sed -e "s@USERSTORE_DB_HOSTNAME@$userstore_db_hostname@g" > repository/conf/datasources/master-datasources.xml
