diff options
| author | Joshua Powers <josh.powers@canonical.com> | 2017-10-02 14:32:48 -0700 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-10-03 09:01:30 -0400 |
| commit | 0ee829f91322ae1788ee6fb2a164cf06cdfff7db (patch) | |
| tree | d5e5f6505eebf9784d60644c254f1d7cb422e51d /tests/cloud_tests/configs/modules/salt_minion.yaml | |
| parent | 9d2a87dc386b7aed1a8243d599676e78ed358749 (diff) | |
| download | vyos-cloud-init-0ee829f91322ae1788ee6fb2a164cf06cdfff7db.tar.gz vyos-cloud-init-0ee829f91322ae1788ee6fb2a164cf06cdfff7db.zip | |
tests: Combine integration configs and testcases
Combine the configs and testcases directories, so all files are
together in one place. Update the test config location as well.
Diffstat (limited to 'tests/cloud_tests/configs/modules/salt_minion.yaml')
| -rw-r--r-- | tests/cloud_tests/configs/modules/salt_minion.yaml | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/tests/cloud_tests/configs/modules/salt_minion.yaml b/tests/cloud_tests/configs/modules/salt_minion.yaml deleted file mode 100644 index f20d24f0..00000000 --- a/tests/cloud_tests/configs/modules/salt_minion.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Create config for a salt minion -# -# 2016-11-17: Currently takes >60 seconds results in test failure -# -enabled: False -cloud_config: | - #cloud-config - salt_minion: - conf: - master: salt.mydomain.com - public_key: | - ------BEGIN PUBLIC KEY------- - <key data> - ------END PUBLIC KEY------- - private_key: | - ------BEGIN PRIVATE KEY------ - <key data> - ------END PRIVATE KEY------- -collect_scripts: - minion: | - #!/bin/bash - cat /etc/salt/minion - minion_id: | - #!/bin/bash - cat /etc/salt/minion_id - minion.pem: | - #!/bin/bash - cat /etc/salt/pki/minion/minion.pem - minion.pub: | - #!/bin/bash - cat /etc/salt/pki/minion/minion.pub - -# vi: ts=4 expandtab |