1
diff --git a/tests/cloud_tests/testcases/modules/salt_minion.py b/tests/cloud_tests/testcases/modules/salt_minion.py
2
0
deleted file mode 100644
0
deleted file mode 100644
3
index fc9688e..0000000
4
--- a/tests/cloud_tests/testcases/modules/salt_minion.py
5
+++ /dev/null
6
@@ -1,38 +0,0 @@
7
1
# This file is part of cloud-init. See LICENSE file for license information.
8
2
9
3
"""cloud-init Integration Test Verify Script."""
10
4
from tests.cloud_tests.testcases import base
11
5
12
6
13
7
class Test(base.CloudTestCase):
14
8
    """Test salt minion module."""
15
9
16
10
    def test_minon_master(self):
17
11
        """Test master value in config."""
18
12
        out = self.get_data_file('minion')
19
13
        self.assertIn('master: salt.mydomain.com', out)
20
14
21
15
    def test_minion_pem(self):
22
16
        """Test private key."""
23
17
        out = self.get_data_file('minion.pem')
24
18
        self.assertIn('------BEGIN PRIVATE KEY------', out)
25
19
        self.assertIn('<key data>', out)
26
20
        self.assertIn('------END PRIVATE KEY-------', out)
27
21
28
22
    def test_minion_pub(self):
29
23
        """Test public key."""
30
24
        out = self.get_data_file('minion.pub')
31
25
        self.assertIn('------BEGIN PUBLIC KEY-------', out)
32
26
        self.assertIn('<key data>', out)
33
27
        self.assertIn('------END PUBLIC KEY-------', out)
34
28
35
29
    def test_grains(self):
36
30
        """Test master value in config."""
37
31
        out = self.get_data_file('grains')
38
32
        self.assertIn('role: web', out)
39
33
40
34
    def test_minion_installed(self):
41
35
        """Test if the salt-minion package is installed"""
42
36
        self.assertPackageInstalled('salt-minion')
43
37
44
38
# vi: ts=4 expandtab
45
diff --git a/tests/cloud_tests/testcases/modules/salt_minion.yaml b/tests/cloud_tests/testcases/modules/salt_minion.yaml
46
39
deleted file mode 100644
0
deleted file mode 100644
47
index 9227147..0000000
48
--- a/tests/cloud_tests/testcases/modules/salt_minion.yaml
49
+++ /dev/null
50
@@ -1,49 +0,0 @@
51
1
#
52
2
# Create config for a salt minion
53
3
#
54
4
# 2016-11-17: Currently takes >60 seconds results in test failure
55
5
#
56
6
enabled: True
57
7
cloud_config: |
58
8
  #cloud-config
59
9
  salt_minion:
60
10
      conf:
61
11
          master: salt.mydomain.com
62
12
      public_key: |
63
13
          ------BEGIN PUBLIC KEY-------
64
14
          <key data>
65
15
          ------END PUBLIC KEY-------
66
16
      private_key: |
67
17
          ------BEGIN PRIVATE KEY------
68
18
          <key data>
69
19
          ------END PRIVATE KEY-------
70
20
      grains:
71
21
          role: web
72
22
collect_scripts:
73
23
  minion: |
74
24
    #!/bin/bash
75
25
    cat /etc/salt/minion
76
26
  minion_id: |
77
27
    #!/bin/bash
78
28
    cat /etc/salt/minion_id
79
29
  minion.pem: |
80
30
    #!/bin/bash
81
31
    PRIV_KEYFILE=/etc/salt/pki/minion/minion.pem
82
32
    if [ ! -f $PRIV_KEYFILE ]; then
83
33
        # Bionic and later automatically moves /etc/salt/pki/minion/*
84
34
        PRIV_KEYFILE=/var/lib/salt/pki/minion/minion.pem
85
35
    fi
86
36
    cat $PRIV_KEYFILE
87
37
  minion.pub: |
88
38
    #!/bin/bash
89
39
    PUB_KEYFILE=/etc/salt/pki/minion/minion.pub
90
40
    if [ ! -f $PUB_KEYFILE ]; then
91
41
        # Bionic and later automatically moves /etc/salt/pki/minion/*
92
42
        PUB_KEYFILE=/var/lib/salt/pki/minion/minion.pub
93
43
    fi
94
44
    cat $PUB_KEYFILE
95
45
  grains: |
96
46
    #!/bin/bash
97
47
    cat /etc/salt/grains
98
48
99
49
# vi: ts=4 expandtab
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2018-06-28
Chad Smith		2018-06-28	Approve on 2018-06-28
Review via email: mp+348719@code.launchpad.net