Updated Branches: refs/heads/master 5d36e6b89 -> 55c430671
fixing puppet related issues Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9ff9e2f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9ff9e2f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9ff9e2f2 Branch: refs/heads/master Commit: 9ff9e2f2f78727adce856a3ab9dc297b33d339f8 Parents: 791e179 Author: Isuru <[email protected]> Authored: Thu Feb 13 17:38:49 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Feb 13 17:38:49 2014 +0530 ---------------------------------------------------------------------- tools/puppet/manifests/classes/lb_cartridge.pp | 8 ++++---- tools/puppet/manifests/classes/mysql.pp | 4 ++-- tools/puppet/manifests/classes/php_cartridge.pp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9ff9e2f2/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 80eaa44..adbd8cf 100644 --- a/tools/puppet/manifests/classes/lb_cartridge.pp +++ b/tools/puppet/manifests/classes/lb_cartridge.pp @@ -14,9 +14,9 @@ class stratos::lb ( $version, $mb_port, $cep_ip, $cep_port, - $java_truststore, - $java_truststore_password, - $enable_data_publisher, + $cert_truststore, + $truststore_password, + $enable_data_publishing, $monitoring_server_ip, $monitoring_server_port, $monitoring_server_secure_port, @@ -124,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},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}", + 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},ENABLE_DATA_PUBLISHER=${enable_data_publishing},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/9ff9e2f2/tools/puppet/manifests/classes/mysql.pp ---------------------------------------------------------------------- diff --git a/tools/puppet/manifests/classes/mysql.pp b/tools/puppet/manifests/classes/mysql.pp index c5e14e8..3a6ea9b 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,enable_data_publisher,monitoring_server_ip,monitoring_server_port,monitoring_server_secure_port,monitoring_server_admin_username,monitoring_server_admin_password) { +class mysql (mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_password,enable_data_publishing,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,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}", + 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=null,ENABLE_DATA_PUBLISHER=${enable_data_publishing},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/9ff9e2f2/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 33cdfbc..bd2b3e9 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,enable_data_publisher,monitoring_server_ip,monitoring_server_port,monitoring_server_secure_port,monitoring_server_admin_username,monitoring_server_admin_password){ +class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_password,enable_data_publishing,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"] @@ -133,7 +133,7 @@ class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,ce 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},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}", + 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_publishing},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"]; }
