From 7a567fea42e372b527b96fc6a9b1da8e18c008fd Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Fri, 12 Feb 2016 09:34:11 +1100 Subject: [PATCH] Don't manage catalina_base variable for tomcat. This should be managed in the tomcat class and there is already a default for it there. Change-Id: I710b672c29d916eb878035ffca2f0bf8c33e2157 --- manifests/midonet_api.pp | 4 +--- manifests/midonet_api/run.pp | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/manifests/midonet_api.pp b/manifests/midonet_api.pp index 189e526..bd6be97 100644 --- a/manifests/midonet_api.pp +++ b/manifests/midonet_api.pp @@ -103,8 +103,7 @@ class midonet::midonet_api( $keystone_tenant_name='admin', $api_ip=$::ipaddress, $api_port='8080', - $bind_address='0.0.0.0', - $catalina_base) { + $bind_address='0.0.0.0') { contain midonet::midonet_api::install @@ -119,7 +118,6 @@ class midonet::midonet_api( keystone_port => $keystone_port, keystone_admin_token => $keystone_admin_token, keystone_tenant_name => $keystone_tenant_name, - catalina_base => $catalina_base, bind_address => $bind_address } contain midonet::midonet_api::run diff --git a/manifests/midonet_api/run.pp b/manifests/midonet_api/run.pp index eb09412..5a3efab 100644 --- a/manifests/midonet_api/run.pp +++ b/manifests/midonet_api/run.pp @@ -33,7 +33,6 @@ class midonet::midonet_api::run ( $keystone_port, $keystone_admin_token, $keystone_tenant_name, - $catalina_base, $bind_address ) { @@ -43,7 +42,6 @@ class midonet::midonet_api::run ( tomcat::config::server::connector {'HTTP/1.1': port => $api_port, - catalina_base => $catalina_base, connector_ensure => 'present', additional_attributes => { 'address' => $bind_address,