x/puppet-midonet
Code Issues Proposed changes

Merge "Don't manage catalina_base variable for tomcat."

Browse Source
This commit is contained in:
Jenkins
2016-02-22 09:23:38 +00:00
committed by Gerrit Code Review
parent 880199aeab 7a567fea42
commit 2d4c0223fd
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/midonet_api.pp
View File

@@ -103,8 +103,7 @@ class midonet::midonet_api(
$keystone_tenant_name='admin', $keystone_tenant_name='admin',
$api_ip=$::ipaddress, $api_ip=$::ipaddress,
$api_port='8080', $api_port='8080',
$bind_address='0.0.0.0', $bind_address='0.0.0.0') {
$catalina_base) {
contain midonet::midonet_api::install contain midonet::midonet_api::install
@@ -119,7 +118,6 @@ class midonet::midonet_api(
keystone_port => $keystone_port, keystone_port => $keystone_port,
keystone_admin_token => $keystone_admin_token, keystone_admin_token => $keystone_admin_token,
keystone_tenant_name => $keystone_tenant_name, keystone_tenant_name => $keystone_tenant_name,
catalina_base => $catalina_base,
bind_address => $bind_address bind_address => $bind_address
} }
contain midonet::midonet_api::run contain midonet::midonet_api::run

2
manifests/midonet_api/run.pp
View File

@@ -33,7 +33,6 @@ class midonet::midonet_api::run (
$keystone_port, $keystone_port,
$keystone_admin_token, $keystone_admin_token,
$keystone_tenant_name, $keystone_tenant_name,
$catalina_base,
$bind_address $bind_address
) { ) {
@@ -43,7 +42,6 @@ class midonet::midonet_api::run (
tomcat::config::server::connector {'HTTP/1.1': tomcat::config::server::connector {'HTTP/1.1':
port => $api_port, port => $api_port,
catalina_base => $catalina_base,
connector_ensure => 'present', connector_ensure => 'present',
additional_attributes => { additional_attributes => {
'address' => $bind_address, 'address' => $bind_address,