x/puppet-midonet
Code Issues Proposed changes

Fix midonet-api connector

Browse Source 
The api did run, but with errors. This patch fixes it.

Change-Id: Iea162b7e95832b04a041cc832591110ee2f4f38d
This commit is contained in:
Jaume Devesa 2015-06-25 18:33:03 +02:00
parent fb558cfdba
commit d7ee219e48
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/midonet_api.pp
View File

@ -100,7 +100,7 @@ class midonet::midonet_api(
$keystone_admin_token=undef,
$keystone_tenant_name='admin',
$api_ip=$::ipaddress,
$api_port='8084',
$api_port='8080',
$catalina_base) {
include midonet::midonet_api::augeas

46
manifests/midonet_api/run.pp
View File

@ -39,36 +39,42 @@ class midonet::midonet_api::run (
require midonet::midonet_api::install
tomcat::instance{'midonet-api':
package_name => $tomcat_package,
package_name => $tomcat_package,
} ->
tomcat::config::server::connector {'midonet-api':
port => $api_port,
catalina_base => $catalina_base,
connector_ensure => 'present',
require => Tomcat::Instance['midonet-api'],
notify => Service[$tomcat_package]
tomcat::config::server::connector {'HTTP/1.1':
port => $api_port,
catalina_base => $catalina_base,
connector_ensure => 'present',
additional_attributes => {
'connectionTimeout' => '20000',
'URIEncoding' => 'UTF-8',
'redirectPort' => '8443',
'maxHttpHeaderSize' => '65536'
},
require => Tomcat::Instance['midonet-api'],
notify => Service[$tomcat_package]
}
file {"/etc/${tomcat_package}/Catalina/localhost/midonet-api.xml":
ensure => present,
source => 'puppet:///modules/midonet/midonet-api/midonet-api.xml',
owner => 'root',
group => 'root',
require => Tomcat::Instance['midonet-api'],
notify => Service[$tomcat_package]
ensure => present,
source => 'puppet:///modules/midonet/midonet-api/midonet-api.xml',
owner => 'root',
group => 'root',
require => Tomcat::Instance['midonet-api'],
notify => Service[$tomcat_package]
}
file {'/usr/share/midonet-api/WEB-INF/web.xml':
ensure => present,
content => template('midonet/midonet-api/web.xml.erb'),
require => Package['midonet-api'],
notify => Service[$tomcat_package]
ensure => present,
content => template('midonet/midonet-api/web.xml.erb'),
require => Package['midonet-api'],
notify => Service[$tomcat_package]
}
service {$tomcat_package:
ensure => running,
require => [File['/usr/share/midonet-api/WEB-INF/web.xml'],
Tomcat::Config::Server::Connector['midonet-api']]
ensure => running,
require => [File['/usr/share/midonet-api/WEB-INF/web.xml'],
Tomcat::Config::Server::Connector['HTTP/1.1']]
}
}