Update yaql for limits and fix typo

Change-Id: I9dad36d22248e6e2b2936e32931c31f7a13bed83
Closes-Bug: 1659351
This commit is contained in:
Oleksiy Molchanov 2017-01-27 15:47:56 +02:00
parent 1b40f3c3e8
commit e4a035a3d5
3 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ class osnailyfacter::limits::limits {
if member($roles, 'compute') {
file { "/etc/init/${libvirt_service_name}.override":
ensure => present,
content => "limit nofile $libvirt_mof_limits $libvirt_mof_limit",
content => "limit nofile $libvirt_mof_limit $libvirt_mof_limit",
mode => '0644',
}
}

View File

@ -7,7 +7,7 @@
requires: [logging]
condition:
yaql_exp: >
changedAny($.get('limits'))
changedAny(($.get('limits', None) = None) and ($.deployed_before.value = false)) or changed($.get('limits'))
parameters:
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/limits/limits.pp
puppet_modules: /etc/puppet/modules

View File

@ -43,7 +43,7 @@ describe manifest do
if Noop.puppet_function 'member', roles, 'compute'
it 'should configure libvirt max open files limit' do
should contain_file('/etc/init/libvirtd.override').with( 'content' => "limit nofile #{libvirt_mof_limits} #{libvirt_mof_limit}" )
should contain_file('/etc/init/libvirtd.override').with( 'content' => "limit nofile #{libvirt_mof_limit} #{libvirt_mof_limit}" )
end
end