openstack
/
fuel-library
Code Issues Proposed changes

Merge "Update yaql for limits and fix typo"

This commit is contained in:
Jenkins 2017-03-09 11:22:07 +00:00 committed by Gerrit Code Review
parent bd29c5d6d3 e4a035a3d5
commit e7b105b34a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/osnailyfacter/manifests/limits/limits.pp
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',
}
}

2
deployment/puppet/osnailyfacter/modular/limits/tasks.yaml
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

2
tests/noop/spec/hosts/limits/limits_spec.rb
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