Merge "Update yaql for limits and fix typo" into stable/newton
This commit is contained in:
commit
be656d6a26
|
@ -24,7 +24,7 @@ class osnailyfacter::limits::limits {
|
||||||
if member($roles, 'compute') {
|
if member($roles, 'compute') {
|
||||||
file { "/etc/init/${libvirt_service_name}.override":
|
file { "/etc/init/${libvirt_service_name}.override":
|
||||||
ensure => present,
|
ensure => present,
|
||||||
content => "limit nofile $libvirt_mof_limits $libvirt_mof_limit",
|
content => "limit nofile $libvirt_mof_limit $libvirt_mof_limit",
|
||||||
mode => '0644',
|
mode => '0644',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
requires: [logging]
|
requires: [logging]
|
||||||
condition:
|
condition:
|
||||||
yaql_exp: >
|
yaql_exp: >
|
||||||
changedAny($.get('limits'))
|
changedAny(($.get('limits', None) = None) and ($.deployed_before.value = false)) or changed($.get('limits'))
|
||||||
parameters:
|
parameters:
|
||||||
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/limits/limits.pp
|
puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/limits/limits.pp
|
||||||
puppet_modules: /etc/puppet/modules
|
puppet_modules: /etc/puppet/modules
|
||||||
|
|
|
@ -43,7 +43,7 @@ describe manifest do
|
||||||
|
|
||||||
if Noop.puppet_function 'member', roles, 'compute'
|
if Noop.puppet_function 'member', roles, 'compute'
|
||||||
it 'should configure libvirt max open files limit' do
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue