Updated Branches: refs/heads/master 012482efc -> ca1b363ec
committing puppet changes for java truststore info. Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ca1b363e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ca1b363e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ca1b363e Branch: refs/heads/master Commit: ca1b363ece192d523311bef59d55a7f0d6ba97aa Parents: 012482e Author: Isuru <[email protected]> Authored: Sun Dec 22 12:16:13 2013 +0530 Committer: Isuru <[email protected]> Committed: Sun Dec 22 12:16:13 2013 +0530 ---------------------------------------------------------------------- tools/puppet/manifests/classes/php_cartridge.pp | 30 +++++++++++--------- tools/puppet/manifests/nodes.pp | 19 +++++++------ 2 files changed, 28 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ca1b363e/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 2800db8..351b4b7 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){ +class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,cep_port,cert_truststore,truststore_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"] @@ -89,23 +89,27 @@ class php_cartridge (syslog,docroot,samlalias,serverport,mb_ip,mb_port,cep_ip,ce # Copy and configure agent packs - file { "/opt/apache-stratos-cartridge-agent/apache-stratos-event-publisher-4.0.0-SNAPSHOT-bin.zip": - source => "puppet:///commons/apache-stratos-event-publisher-4.0.0-SNAPSHOT-bin.zip", - ensure => present, - } + #file { "/opt/apache-stratos-cartridge-agent/apache-stratos-event-publisher-4.0.0-SNAPSHOT-bin.zip": + # source => "puppet:///commons/apache-stratos-event-publisher-4.0.0-SNAPSHOT-bin.zip", + # ensure => present, + #} - file { "/opt/apache-stratos-cartridge-agent/apache-stratos-event-subscriber-4.0.0-SNAPSHOT-bin.zip": - source => "puppet:///commons/apache-stratos-event-subscriber-4.0.0-SNAPSHOT-bin.zip", - ensure => present, - } + #file { "/opt/apache-stratos-cartridge-agent/apache-stratos-event-subscriber-4.0.0-SNAPSHOT-bin.zip": + # source => "puppet:///commons/apache-stratos-event-subscriber-4.0.0-SNAPSHOT-bin.zip", + # ensure => present, + #} - file { "/opt/apache-stratos-cartridge-agent/apache-stratos-health-publisher-4.0.0-SNAPSHOT-bin.zip": - source => "puppet:///commons/apache-stratos-health-publisher-4.0.0-SNAPSHOT-bin.zip", + #file { "/opt/apache-stratos-cartridge-agent/apache-stratos-health-publisher-4.0.0-SNAPSHOT-bin.zip": + # source => "puppet:///commons/apache-stratos-health-publisher-4.0.0-SNAPSHOT-bin.zip", + # ensure => present, + #} + + file { "/opt/apache-stratos-cartridge-agent/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip": + source => "puppet:///commons/apache-stratos-cartridge-agent-4.0.0-SNAPSHOT-bin.zip", ensure => present, } - file { "/opt/apache-stratos-cartridge-agent/cartridge-agent.sh": source => "puppet:///commons/cartridge-agent.sh", ensure => present, @@ -126,7 +130,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}", + 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}", require => Exec["apache2 restart"]; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ca1b363e/tools/puppet/manifests/nodes.pp ---------------------------------------------------------------------- diff --git a/tools/puppet/manifests/nodes.pp b/tools/puppet/manifests/nodes.pp index 47833cf..ba933c9 100755 --- a/tools/puppet/manifests/nodes.pp +++ b/tools/puppet/manifests/nodes.pp @@ -50,14 +50,17 @@ node /[0-9]{1,12}.default.php/ { include java class {"php_cartridge": - syslog => "syslog:local2", - 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", + syslog => "syslog:local2", + 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", + } }
