x/puppet-midonet
Code Issues Proposed changes

New default config path for Midolman

Browse Source 
Change-Id: I837688929f29426e6405f0d89ed292a32cde448f
(cherry picked from commit 76905f0312ae316cbc9f608b6afca47f76eca4ce)
This commit is contained in:
Alejandro Andreu 2017-01-30 17:27:31 +01:00
parent 3a80383374
commit 01bd8a8790
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
manifests/agent/run.pp
View File

@ -75,13 +75,14 @@ class midonet::agent::run (
$controller_host, $controller_host,
$metadata_port, $metadata_port,
$shared_secret, $shared_secret,
$service_name = 'midolman', $service_name = 'midolman',
$service_ensure = 'running', $service_ensure = 'running',
$service_enable = true, $service_enable = true,
$agent_config_path = '/etc/midolman/midolman.conf', $midonet_config_path = '/etc/midonet/midonet.conf',
$jvm_config_path = '/etc/midolman/midolman-env.sh', $agent_config_path = '/etc/midolman/midolman.conf',
$max_heap_size = '1024M', $jvm_config_path = '/etc/midolman/midolman-env.sh',
$dhcp_mtu = undef $max_heap_size = '1024M',
$dhcp_mtu = undef
) { ) {
file { '/tmp/mn-agent_config.sh': file { '/tmp/mn-agent_config.sh':
@ -100,6 +101,28 @@ class midonet::agent::run (
before => File['/tmp/mn-agent_config.sh'], before => File['/tmp/mn-agent_config.sh'],
} }
if !defined(File['set_config']) {
file { 'set_config':
ensure => present,
path => $midonet_config_path,
content => template('midonet/agent/midolman.conf.erb'),
require => [
Package['midolman'],
File['midonet folder']
],
notify => Service['midolman'],
before => File['/tmp/mn-agent_config.sh'],
}
}
if !defined(File['midonet folder']) {
file { 'midonet folder':
ensure => 'directory',
path => '/etc/midonet',
owner => 'root',
mode => '0755',
}
}
file { 'jvm_config': file { 'jvm_config':
ensure => present, ensure => present,
path => $jvm_config_path, path => $jvm_config_path,