From b992f4b4c048e570eecc71b08d0dc578b6638535 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 13 Jul 2019 16:55:54 +0100 Subject: [PATCH] refactor(kitchen+inspec): move inline pillars to files --- kitchen.yml | 14 ++++---------- test/salt/pillar/default.sls | 4 ++++ test/salt/pillar/fedora.sls | 3 +++ 3 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 test/salt/pillar/default.sls create mode 100644 test/salt/pillar/fedora.sls diff --git a/kitchen.yml b/kitchen.yml index 3d2f65a..1a0d5e3 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -76,11 +76,8 @@ platforms: driver: image: netmanagers/salt-2018.3-py2:fedora-29 provisioner: - pillars: - locale.sls: - locale: - pkgs: - - glibc-langpack-de + pillars_from_files: + locale.sls: test/salt/pillar/fedora.sls # TODO: Use this when fixed instead of `opensuse-leap-42` # Ref: https://github.com/netmanagers/salt-image-builder/issues/2 @@ -130,11 +127,8 @@ provisioner: base: '*': - locale - locale.sls: - locale: - present: - - "en_US.UTF-8 UTF-8" - - "de_DE.UTF-8 UTF-8" + pillars_from_files: + locale.sls: test/salt/pillar/default.sls verifier: # https://www.inspec.io/ diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls new file mode 100644 index 0000000..9f6e7b5 --- /dev/null +++ b/test/salt/pillar/default.sls @@ -0,0 +1,4 @@ +locale: + present: + - "en_US.UTF-8 UTF-8" + - "de_DE.UTF-8 UTF-8" diff --git a/test/salt/pillar/fedora.sls b/test/salt/pillar/fedora.sls new file mode 100644 index 0000000..60d3aff --- /dev/null +++ b/test/salt/pillar/fedora.sls @@ -0,0 +1,3 @@ +locale: + pkgs: + - glibc-langpack-de