From 6c46392cc4287a348245f0d1f2d2ba5f593f8444 Mon Sep 17 00:00:00 2001 From: Benjamin Pineau Date: Sun, 13 Mar 2016 19:43:02 +0100 Subject: [PATCH] Fix sysconfig template when public_ip is defined No need to double quote the IP (esp. since the generated string will be part of an other double quoted string). Also, prevent a line break. Without those changes, we end up generating something like that: FLANNEL_OPTIONS=" -alsologtostderr=true -ip-masq=false -public-ip="10.120.10.158" -subnet-dir=/run/flannel/networks -subnet-file=/run/flannel/subnet.env" which prevent flanneld from starting. --- templates/sysconfig/flanneld.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sysconfig/flanneld.erb b/templates/sysconfig/flanneld.erb index 79a6f52..20a95dd 100644 --- a/templates/sysconfig/flanneld.erb +++ b/templates/sysconfig/flanneld.erb @@ -29,7 +29,7 @@ FLANNEL_OPTIONS="<% -%> -networks=<%= scope['flannel::networks'] -%> <% end -%> <% if @public_ip then -%> - -public-ip="<%= scope['flannel::public_ip'] %>" + -public-ip=<%= scope['flannel::public_ip'] -%> <% end -%> <% if @remote then -%> -remote=<%= scope['flannel::remote'] -%>