From e4a035a3d59d6ccf26db1c47abf0a3c9a6b7c19c Mon Sep 17 00:00:00 2001
From: Oleksiy Molchanov <omolchanov@mirantis.com>
Date: Fri, 27 Jan 2017 15:47:56 +0200
Subject: [PATCH] Update yaql for limits and fix typo

Change-Id: I9dad36d22248e6e2b2936e32931c31f7a13bed83
Closes-Bug: 1659351
---
 deployment/puppet/osnailyfacter/manifests/limits/limits.pp | 2 +-
 deployment/puppet/osnailyfacter/modular/limits/tasks.yaml  | 2 +-
 tests/noop/spec/hosts/limits/limits_spec.rb                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployment/puppet/osnailyfacter/manifests/limits/limits.pp b/deployment/puppet/osnailyfacter/manifests/limits/limits.pp
index c7bbd204e5..adb4d67b1d 100644
--- a/deployment/puppet/osnailyfacter/manifests/limits/limits.pp
+++ b/deployment/puppet/osnailyfacter/manifests/limits/limits.pp
@@ -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',
     }
   }
diff --git a/deployment/puppet/osnailyfacter/modular/limits/tasks.yaml b/deployment/puppet/osnailyfacter/modular/limits/tasks.yaml
index ebfde41c6c..61eec85704 100644
--- a/deployment/puppet/osnailyfacter/modular/limits/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/limits/tasks.yaml
@@ -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
diff --git a/tests/noop/spec/hosts/limits/limits_spec.rb b/tests/noop/spec/hosts/limits/limits_spec.rb
index 831c3e64f7..5ca132f66f 100644
--- a/tests/noop/spec/hosts/limits/limits_spec.rb
+++ b/tests/noop/spec/hosts/limits/limits_spec.rb
@@ -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