Updated Branches: refs/heads/master 308abedc0 -> 65d60c7ec
puppet changes related to data publishing Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e80dda2e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e80dda2e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e80dda2e Branch: refs/heads/master Commit: e80dda2e7cbaaae75cb7fe46fc710851bcb48f87 Parents: a1e7acb Author: Isuru <[email protected]> Authored: Thu Feb 13 12:46:51 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Feb 13 12:46:51 2014 +0530 ---------------------------------------------------------------------- .../puppet/etc/puppet/files/cartridge-agent.sh | 13 +++ tools/puppet/manifests/classes/lb_cartridge.pp | 10 ++- tools/puppet/manifests/classes/mysql.pp | 4 +- tools/puppet/manifests/classes/php_cartridge.pp | 12 +-- tools/puppet/manifests/nodes.pp | 84 +++++++++++--------- 5 files changed, 74 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e80dda2e/tools/puppet/etc/puppet/files/cartridge-agent.sh ---------------------------------------------------------------------- diff --git a/tools/puppet/etc/puppet/files/cartridge-agent.sh b/tools/puppet/etc/puppet/files/cartridge-agent.sh index ab7da60..3744496 100755 --- a/tools/puppet/etc/puppet/files/cartridge-agent.sh +++ b/tools/puppet/etc/puppet/files/cartridge-agent.sh @@ -90,6 +90,19 @@ cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp cat bin/$cartridge_agent_script.tmp | sed -e "s@CERT-TRUSTSTORE@$truststore_path/$CERT_TRUSTSTORE@g" > bin/$cartridge_agent_script cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp cat bin/$cartridge_agent_script.tmp | sed -e "s@\bTRUSTSTORE-PASSWORD\b@$TRUSTSTORE_PASSWORD@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@\bENABLE-DATA-PUBLISHER\b@$ENABLE_DATA_PUBLISHER@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-IP\b@$MONITORING_SERVER_IP@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-PORT\b@$MONITORING_SERVER_PORT@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-SECURE-PORT\b@$MONITORING_SERVER_SECURE_PORT@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-ADMIN-USERNAME\b@$MONITORING_SERVER_ADMIN_USERNAME@g" > bin/$cartridge_agent_script +cp -f bin/$cartridge_agent_script bin/$cartridge_agent_script.tmp +cat bin/$cartridge_agent_script.tmp | sed -e "s@\bMONITORING-SERVER-ADMIN-PASSWORD\b@$MONITORING_SERVER_ADMIN_PASSWORD@g" > bin/$cartridge_agent_script + rm -f bin/$cartridge_agent_script.tmp popd http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e80dda2e/tools/puppet/manifests/classes/lb_cartridge.pp ---------------------------------------------------------------------- diff --git a/tools/puppet/manifests/classes/lb_cartridge.pp b/tools/puppet/manifests/classes/lb_cartridge.pp index e7a4709..80eaa44 100644 --- a/tools/puppet/manifests/classes/lb_cartridge.pp +++ b/tools/puppet/manifests/classes/lb_cartridge.pp @@ -15,7 +15,13 @@ class stratos::lb ( $version, $cep_ip, $cep_port, $java_truststore, - $java_truststore_password) { + $java_truststore_password, + $enable_data_publisher, + $monitoring_server_ip, + $monitoring_server_port, + $monitoring_server_secure_port, + $monitoring_server_admin_username, + $monitoring_server_admin_password) { $deployment_code = "load-balancer" @@ -118,7 +124,7 @@ class stratos::lb ( $version, file {"/tmp/puppet-payload": ensure => present, - content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${java_truststore},TRUSTSTORE_PASSWORD=${java_truststore_password}", + content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${java_truststore},TRUSTSTORE_PASSWORD=${java_truststore_password},ENABLE_DATA_PUBLISHER=${enable_data_publisher},MONITORING_SERVER_IP=${monitoring_server_ip},MONITORING_SERVER_PORT=${monitoring_server_port},MONITORING_SERVER_SECURE_PORT=${monitoring_server_secure_port},MONITORING_SERVER_ADMIN_USERNAME=${monitoring_server_admin_username},MONITORING_SERVER_ADMIN_PASSWORD=${monitoring_server_admin_password}", } exec {"run_agent_script-$deployment_code": http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e80dda2e/tools/puppet/manifests/classes/mysql.pp ---------------------------------------------------------------------- diff --git a/tools/puppet/manifests/classes/mysql.pp b/tools/puppet/manifests/classes/mysql.pp index 2f78a50..c5e14e8 100644 --- a/tools/puppet/manifests/classes/mysql.pp +++ b/tools/puppet/manifests/classes/mysql.pp @@ -20,7 +20,7 @@ # -------------------------------------------------------------- -class mysql (mb_ip,mb_port,cep_ip,cep_port,java_truststore,java_truststore_password) { +class mysql (mb_ip,mb_port,cep_ip,cep_port,java_truststore,java_truststore_password,enable_data_publisher,monitoring_server_ip,monitoring_server_port,monitoring_server_secure_port,monitoring_server_admin_username,monitoring_server_admin_password) { if $stratos_mysql_password { $root_password = $stratos_mysql_password @@ -109,7 +109,7 @@ class mysql (mb_ip,mb_port,cep_ip,cep_port,java_truststore,java_truststore_passw file {"/tmp/puppet-payload": ensure => present, - content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${java_truststore},TRUSTSTORE_PASSWORD=${java_truststore_password},APP_PATH=null", + content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${java_truststore},TRUSTSTORE_PASSWORD=${java_truststore_password},APP_PATH=null,ENABLE_DATA_PUBLISHER=${enable_data_publisher},MONITORING_SERVER_IP=${monitoring_server_ip},MONITORING_SERVER_PORT=${monitoring_server_port},MONITORING_SERVER_SECURE_PORT=${monitoring_server_secure_port},MONITORING_SERVER_ADMIN_USERNAME=${monitoring_server_admin_username},MONITORING_SERVER_ADMIN_PASSWORD=${monitoring_server_admin_password}", require => Service['apache2']; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e80dda2e/tools/puppet/manifests/classes/php_cartridge.pp ---------------------------------------------------------------------- diff --git a/tools/puppet/manifests/classes/php_cartridge.pp b/tools/puppet/manifests/classes/php_cartridge.pp index 33d708d..33cdfbc 100755 --- a/tools/puppet/manifests/classes/php_cartridge.pp +++ b/tools/puppet/manifests/classes/php_cartridge.pp @@ -20,7 +20,7 @@ # -------------------------------------------------------------- -class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_password){ +class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_password,enable_data_publisher,monitoring_server_ip,monitoring_server_port,monitoring_server_secure_port,monitoring_server_admin_username,monitoring_server_admin_password){ $packages = ["nano","zip","build-essential","mysql-client","apache2","php5","php5-cli","libapache2-mod-php5","php5-gd","php5-mysql","php-db","php-pear","php5-curl","curl","wget","php5-ldap","php5-adodb","mailutils","php5-imap","php5-sqlite","php5-xmlrpc","php5-xsl","openssl","ssl-cert","ldap-utils","php5-mcrypt","mcrypt","ufw","fail2ban","git","libboost-all-dev","ruby"] @@ -125,15 +125,15 @@ class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,ce } - file { "/opt/apache-stratos-cartridge-agent/healthcheck.sh": - source => "puppet:///commons/healthcheck.sh", - ensure => present, - } + #file { "/opt/apache-stratos-cartridge-agent/healthcheck.sh": + # source => "puppet:///commons/healthcheck.sh", + # ensure => present, + #} file {"/tmp/puppet-payload": ensure => present, - content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${cert_truststore},TRUSTSTORE_PASSWORD=${truststore_password},APP_PATH=${docroot}", + content => ",MB_IP=${mb_ip},MB_PORT=${mb_port},CEP_IP=${cep_ip},CEP_PORT=${cep_port},CERT_TRUSTSTORE=${cert_truststore},TRUSTSTORE_PASSWORD=${truststore_password},APP_PATH=${docroot},ENABLE_DATA_PUBLISHER=${enable_data_publisher},MONITORING_SERVER_IP=${monitoring_server_ip},MONITORING_SERVER_PORT=${monitoring_server_port},MONITORING_SERVER_SECURE_PORT=${monitoring_server_secure_port},MONITORING_SERVER_ADMIN_USERNAME=${monitoring_server_admin_username},MONITORING_SERVER_ADMIN_PASSWORD=${monitoring_server_admin_password}", require => Exec["apache2 restart"]; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e80dda2e/tools/puppet/manifests/nodes.pp ---------------------------------------------------------------------- diff --git a/tools/puppet/manifests/nodes.pp b/tools/puppet/manifests/nodes.pp index 6039919..db28fca 100755 --- a/tools/puppet/manifests/nodes.pp +++ b/tools/puppet/manifests/nodes.pp @@ -33,7 +33,18 @@ node confignode inherits basenode { ## Server details for billing $time_zone = "GMT-8:00" - + mb_ip => "54.251.211.89", + mb_port => "5677", + cep_ip => "54.251.211.89", + cep_port => "7615", + cert_truststore => "client-truststore.jks", + truststore_password => "wso2carbon", + enable_data_publishing => "false", + monitoring_server_ip => "xx.xx.xx.xx", + monitoring_server_port => "xxxx", + monitoring_server_secure_port => "xxxx", + monitoring_server_admin_username => "xxxx", + monitoring_server_admin_password => "xxxx", } node 'puppet.novalocal' inherits confignode { @@ -44,8 +55,7 @@ node 'puppet.novalocal' inherits confignode { } - -node /[0-9]{1,12}.default.php/ { +node /[0-9]{1,12}.default.php/ inherits confignode { include java @@ -54,56 +64,52 @@ node /[0-9]{1,12}.default.php/ { docroot => "/var/www/www", samlalias => "/var/www/simplesamlphp/www", serverport => "443", - mb_ip => "54.251.211.89", - mb_port => "5677", - cep_ip => "54.251.211.89", - cep_port => "7615", - cert_truststore => "client-truststore.jks", - truststore_password => "wso2carbon", - + mb_ip => $mb_ip, + mb_port => $mb_port, + cep_ip => $cep_ip, + cep_port => $cep_port, + cert_truststore => $cert_truststore, + truststore_password => $cert_truststore, } } -node /[0-9]{1,12}.default.lb/ inherits confignode{ +node /[0-9]{1,12}.default.lb/ inherits confignode { $server_ip = $ec2_local_ipv4 include java class {"stratos::lb": - version => "4.0.0-SNAPSHOT", - offset => 0, - tribes_port => 4100, - maintenance_mode => "false", - owner => "root", - group => "root", - stage => "deploy", - adc_host => "sc.stratos.org", - adc_port => 9445, - cartridge_type => "load-balancer", - generic => 1, - mb_ip => "54.251.196.18", - mb_port => "5677", - cep_ip => "54.251.196.18", - cep_port => "7615", - java_truststore => "client-truststore.jks", - java_truststore_password => "wso2carbon", - - + version => "4.0.0-SNAPSHOT", + offset => 0, + tribes_port => 4100, + maintenance_mode => "false", + owner => "root", + group => "root", + stage => "deploy", + adc_host => "sc.stratos.org", + adc_port => 9445, + cartridge_type => "load-balancer", + generic => 1, + mb_ip => $mb_ip, + mb_port => $mb_port, + cep_ip => $cep_ip, + cep_port => $cep_port, + cert_truststore => $cert_truststore, + truststore_password => $cert_truststore, } } -node /[0-9]{1,12}.default.mysql/ { +node /[0-9]{1,12}.default.mysql/ inherits confignode { include java class {"mysql": - mb_ip => "54.251.211.89", - mb_port => "5677", - cep_ip => "54.251.211.89", - cep_port => "7615", - cert_truststore => "client-truststore.jks", - truststore_password => "wso2carbon", - - } + mb_ip => $mb_ip, + mb_port => $mb_port, + cep_ip => $cep_ip, + cep_port => $cep_port, + cert_truststore => $cert_truststore, + truststore_password => $cert_truststore, + } }
