From aa578ae78b3937c23fb026c7304d92e1d808ffbd Mon Sep 17 00:00:00 2001
From: Sergey Vasilenko <svasilenko@mirantis.com>
Date: Mon, 20 Oct 2014 17:50:00 +0400
Subject: [PATCH] Make sysctl net.ipv4.ip_forward def safe
When using puppet-nova with another big Puppet modules
this sysctl may be defined before.
The solution is to make a definition safe.
Closes-bug: #1384145
Change-Id: I4d28f277bccd16f3719a4806e641461df3749518
---
manifests/network.pp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/manifests/network.pp b/manifests/network.pp
index 46ca0fc4b..e928715eb 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -79,9 +79,7 @@ class nova::network(
path => $::path
}
- sysctl::value { 'net.ipv4.ip_forward':
- value => '1'
- }
+ ensure_resource('sysctl::value', 'net.ipv4.ip_forward', { value => '1' })
if $floating_range {
nova_config { 'DEFAULT/floating_range': value => $floating_range }