From c8147797747f4c9b8d07d6310df750521f01ac82 Mon Sep 17 00:00:00 2001 From: fthenard Date: Mon, 27 Jan 2020 10:45:30 +0100 Subject: [PATCH] fix(default.sls): fix subnet declaration * https://travis-ci.com/saltstack-formulas/bind-formula/jobs/269539556 * Modified commit from #144 --- test/integration/default/controls/config_spec.rb | 2 +- test/salt/pillar/default.sls | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/default/controls/config_spec.rb b/test/integration/default/controls/config_spec.rb index 2611075..129f84c 100644 --- a/test/integration/default/controls/config_spec.rb +++ b/test/integration/default/controls/config_spec.rb @@ -169,6 +169,6 @@ control 'File ' + config + '.local' do # Match acl1 its('content') { should match /acl\ client1\ \{\n\ \ 127\.0\.0\.0\/8;\n\ \ 10\.20\.0\.0\/16;\n\};/ } # Match acl2 - its('content') { should match /^acl\ client2\ \{\n\ \ 10\.30\.0\.0\/8;\n\};/ } + its('content') { should match /acl\ client2\ \{\n\ \ 10\.0\.0\.0\/8;\n\ \ 10\.30\.0\.0\/16;\n\};/ } end end diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index 0871e87..8e422e5 100644 --- a/test/salt/pillar/default.sls +++ b/test/salt/pillar/default.sls @@ -7,7 +7,8 @@ bind: - 127.0.0.0/8 - 10.20.0.0/16 client2: - - 10.30.0.0/8 + - 10.0.0.0/8 + - 10.30.0.0/16 configured_zones: example.com: type: master