From 726c7afab7f2f2d3514f2fd8083ed7e009361df7 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 19 Oct 2015 14:21:17 -0400 Subject: [PATCH] AWS: install netcat-traditional, instead of netcat-openbsd We want to match the version of netcat that is installed on GCE. We were having problems with netcat-openbsd having slightly different timeout behaviour (on UDP packets; when there was no listener). --- cluster/saltbase/salt/base.sls | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cluster/saltbase/salt/base.sls b/cluster/saltbase/salt/base.sls index 6e805f31eae..ac7924d7b4d 100644 --- a/cluster/saltbase/salt/base.sls +++ b/cluster/saltbase/salt/base.sls @@ -12,3 +12,9 @@ pkg-core: - glusterfs-client - socat {% endif %} +# Ubuntu installs netcat-openbsd by default, but on GCE/Debian netcat-traditional is installed. +# They behave slightly differently. +# For sanity, we try to make sure we have the same netcat on all OSes (#15166) +{% if grains['os'] == 'Ubuntu' %} + - netcat-traditional +{% endif %}