summaryrefslogtreecommitdiff
path: root/tests/cloud_tests/testcases/modules/salt_minion.yaml
diff options
context:
space:
mode:
authorDaniel Wallace <danielwallace@gtmanfred.com>2017-12-04 16:49:15 -0700
committerScott Moser <smoser@ubuntu.com>2018-02-23 10:26:42 -0500
commit65f0b263a1af170802215823d6e354f8bdfa5f39 (patch)
tree37ddb2b1528973f56b4c1bd52b73e8b0e7a15de1 /tests/cloud_tests/testcases/modules/salt_minion.yaml
parent1e2c2f84cf68e19728f7bc51f0c9322c3e895019 (diff)
downloadvyos-cloud-init-65f0b263a1af170802215823d6e354f8bdfa5f39.tar.gz
vyos-cloud-init-65f0b263a1af170802215823d6e354f8bdfa5f39.zip
salt: configure grains in grains file rather than in minion config.
While salt grains can be configured in the minion config file, it is usually better to configure it in the /etc/salt/grains file. This allows that to be done.
Diffstat (limited to 'tests/cloud_tests/testcases/modules/salt_minion.yaml')
-rw-r--r--tests/cloud_tests/testcases/modules/salt_minion.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/cloud_tests/testcases/modules/salt_minion.yaml b/tests/cloud_tests/testcases/modules/salt_minion.yaml
index f20d24f0..ab0e05bb 100644
--- a/tests/cloud_tests/testcases/modules/salt_minion.yaml
+++ b/tests/cloud_tests/testcases/modules/salt_minion.yaml
@@ -17,6 +17,8 @@ cloud_config: |
------BEGIN PRIVATE KEY------
<key data>
------END PRIVATE KEY-------
+ grains:
+ role: web
collect_scripts:
minion: |
#!/bin/bash
@@ -30,5 +32,8 @@ collect_scripts:
minion.pub: |
#!/bin/bash
cat /etc/salt/pki/minion/minion.pub
+ grains: |
+ #!/bin/bash
+ cat /etc/salt/grains
# vi: ts=4 expandtab