From 685cd3c4cc211807bf734c31e6da77d93038d394 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Sat, 10 Oct 2020 21:18:25 +0100 Subject: [PATCH] fix(typo): rename grain to grains --- kubernetes/devtools/binary/install.sls | 2 +- kubernetes/node/archive/clean.sls | 2 +- kubernetes/sigs/archive/install.sls | 2 +- kubernetes/sigs/binary/install.sls | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/devtools/binary/install.sls b/kubernetes/devtools/binary/install.sls index d5725a74..230af8b3 100644 --- a/kubernetes/devtools/binary/install.sls +++ b/kubernetes/devtools/binary/install.sls @@ -44,7 +44,7 @@ - cmd: {{ formula }}-devtools-binary-{{ tool }}-install {%- endif %} - {%- if (d.linux.altpriority|int == 0 and grain.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} + {%- if (d.linux.altpriority|int == 0 and grains.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} {%- for cmd in p[tool]['commands']|unique %} {{ formula }}-devtools-binary-{{ tool }}-install-symlink-{{ cmd }}: file.symlink: diff --git a/kubernetes/node/archive/clean.sls b/kubernetes/node/archive/clean.sls index 7a90ed26..bdde5a47 100644 --- a/kubernetes/node/archive/clean.sls +++ b/kubernetes/node/archive/clean.sls @@ -14,7 +14,7 @@ include: - names: - {{ d.dir.tmp }}/kubernetes-node* - {{ d.node.pkg.path }}/bin - {%- if (d.linux.altpriority|int == 0 and grain.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} + {%- if (d.linux.altpriority|int == 0 and grains.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} {%- for cmd in d.node.pkg.commands|unique %} - /usr/local/bin/{{ cmd }} {%- endfor %} diff --git a/kubernetes/sigs/archive/install.sls b/kubernetes/sigs/archive/install.sls index 16764561..7d88359f 100644 --- a/kubernetes/sigs/archive/install.sls +++ b/kubernetes/sigs/archive/install.sls @@ -46,7 +46,7 @@ - user - group {%- endif %} - {%- if (d.linux.altpriority|int == 0 and grain.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} + {%- if (d.linux.altpriority|int == 0 and grains.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} {%- for cmd in p['commands']|unique %} {{ formula }}-sigs-archive-{{ tool }}-install-symlink-{{ cmd }}: diff --git a/kubernetes/sigs/binary/install.sls b/kubernetes/sigs/binary/install.sls index 111ee7e9..bb434aea 100644 --- a/kubernetes/sigs/binary/install.sls +++ b/kubernetes/sigs/binary/install.sls @@ -50,7 +50,7 @@ - cmd: {{ formula }}-sigs-binary-{{ tool }}-install {%- endif %} - {%- if (d.linux.altpriority|int == 0 and grain.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} + {%- if (d.linux.altpriority|int == 0 and grains.os != 'Windows') or grains.os_family in ('Arch', 'MacOS') %} {%- for cmd in p['commands']|unique %} {{ formula }}-sigs-binary-{{ tool }}-install-symlink-{{ cmd }}: