x/puppet-midonet
Code Issues Proposed changes

Parametrizes correctly midonet::agent

Browse Source 
Change-Id: Id54c021336e2ca48cf361a9dd74db1e0e77c1031
This commit is contained in:
Alejandro Andreu 2016-07-15 15:46:16 +02:00
parent 8ef2b1cd18
commit 9538a6ca7d
4 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/agent.pp
View File

@ -73,12 +73,14 @@
#
class midonet::agent (
$package_name = undef,
$service_name = undef,
$agent_config_path = undef,
$package_ensure = undef,
$manage_java = undef,
$zookeeper_hosts = undef,
$package_name = undef,
$service_name = undef,
$service_ensure = undef,
$service_enable = undef,
$agent_config_path = undef,
$package_ensure = undef,
$manage_java = undef,
$zookeeper_hosts = undef,
) {
include midonet::repository
@ -91,8 +93,9 @@ class midonet::agent (
}
class { 'midonet::agent::run':
package_name => $package_name,
service_name => $service_name,
service_ensure => undef,
service_enable => undef,
agent_config_path => $agent_config_path,
zookeeper_hosts => $zookeeper_hosts,
require => Class['midonet::agent::install'],

10
manifests/agent/install.pp
View File

@ -70,13 +70,17 @@ class midonet::agent::install (
case $::osfamily {
'Debian': {
package { $package_name:
package { 'midolman':
ensure => $package_ensure,
require => Exec['apt_update']
name => $package_name,
require => Exec['apt_update'],
}
}
'RedHat': {
package { $package_name: ensure => $package_ensure }
package { 'midolman':
ensure => $package_ensure,
name => $package_name,
}
}
default: {
fail("Midonet agent cannot be installed on ${::osfamily}-based systems")

24
manifests/agent/run.pp
View File

@ -36,17 +36,23 @@
# limitations under the License.
#
class midonet::agent::run (
$service_name = 'midolman',
$package_name = 'midolman',
$agent_config_path = '/etc/midolman/midolman.conf',
$zookeeper_hosts = [{ 'ip' => '127.0.0.1', 'port' => '2181' }],
$service_name = 'midolman',
$service_ensure = 'running',
$service_enable = true,
$agent_config_path = '/etc/midolman/midolman.conf',
$zookeeper_hosts = [{ 'ip' => '127.0.0.1', 'port' => '2181' }],
) {
file { $agent_config_path:
ensure => present,
content => template('midonet/agent/midolman.conf.erb'),
require => Package[$package_name],
file { 'agent_config':
ensure => present,
path => $agent_config_path,
content => template('midonet/agent/midolman.conf.erb'),
require => Package['midolman'],
} ~>
service { $service_name: ensure => running }
service { 'midolman':
ensure => $service_ensure,
name => $service_name,
enable => $service_enable,
}
}

2
spec/classes/midonet_agent_run_spec.rb
View File

@ -9,7 +9,7 @@ describe 'midonet::agent::run' do
:lsbdistrelease => '16.04',
}
end
it { is_expected.to contain_file('/etc/midolman/midolman.conf').with(
it { is_expected.to contain_file('agent_config').with(
'ensure' => 'present',
) }
it { is_expected.to contain_service('midolman').with_ensure('running') }