1
=== modified file 'src/maasserver/compose_preseed.py'
2
--- src/maasserver/compose_preseed.py	2015-10-30 18:12:45 +0000
3
+++ src/maasserver/compose_preseed.py	2015-11-12 19:17:29 +0000
4
@@ -43,6 +43,42 @@
5
43
        return None
43
        return None
6
44
44
7
45
45
8
46
def get_system_info():
9
47
    """Return the system info which includes the APT mirror information."""
10
48
    return {
11
49
        "system_info": {
12
50
            "package_mirrors": [
13
51
                {
14
52
                    "arches": ["i386", "amd64"],
15
53
                    "search": {
16
54
                        "primary": [
17
55
                            Config.objects.get_config("main_archive")],
18
56
                        "security": [
19
57
                            Config.objects.get_config("main_archive")],
20
58
                    },
21
59
                    "failsafe": {
22
60
                        "primary": "http://archive.ubuntu.com/ubuntu",
23
61
                        "security": "http://security.ubuntu.com/ubuntu",
24
62
                    }
25
63
                },
26
64
                {
27
65
                    "arches": ["default"],
28
66
                    "search": {
29
67
                        "primary": [
30
68
                            Config.objects.get_config("ports_archive")],
31
69
                        "security": [
32
70
                            Config.objects.get_config("ports_archive")],
33
71
                    },
34
72
                    "failsafe": {
35
73
                        "primary": "http://ports.ubuntu.com/ubuntu-ports",
36
74
                        "security": "http://ports.ubuntu.com/ubuntu-ports",
37
75
                    }
38
76
                },
39
77
            ]
40
78
        }
41
79
    }
42
80
43
81
44
46
def compose_cloud_init_preseed(node, token, base_url=''):
82
def compose_cloud_init_preseed(node, token, base_url=''):
45
47
    """Compose the preseed value for a node in any state but Commissioning."""
83
    """Compose the preseed value for a node in any state but Commissioning."""
46
48
    credentials = urlencode({
84
    credentials = urlencode({
47
@@ -75,8 +111,10 @@
48
75
                'token_key': token.key,
111
                'token_key': token.key,
49
76
                'token_secret': token.secret,
112
                'token_secret': token.secret,
50
77
            }
113
            }
52
78
        },
114
        }
53
79
    }
115
    }
54
116
    # Add the system configuration information.
55
117
    config.update(get_system_info())
56
80
    apt_proxy = get_apt_proxy_for_node(node)
118
    apt_proxy = get_apt_proxy_for_node(node)
57
81
    use_apt_proxy = (
119
    use_apt_proxy = (
58
82
        apt_proxy is not None and len(apt_proxy) > 0 and not
120
        apt_proxy is not None and len(apt_proxy) > 0 and not
59
@@ -146,6 +184,8 @@
60
146
            },
184
            },
61
147
        },
185
        },
62
148
    }
186
    }
63
187
    # Add the system configuration information.
64
188
    cloud_config.update(get_system_info())
65
149
    if apt_proxy:
189
    if apt_proxy:
66
150
        cloud_config['apt_proxy'] = apt_proxy
190
        cloud_config['apt_proxy'] = apt_proxy
67
151
    return "#cloud-config\n%s" % yaml.safe_dump(cloud_config)
191
    return "#cloud-config\n%s" % yaml.safe_dump(cloud_config)
68
152
192
69
=== modified file 'src/maasserver/tests/test_compose_preseed.py'
70
--- src/maasserver/tests/test_compose_preseed.py	2015-10-30 16:03:19 +0000
71
+++ src/maasserver/tests/test_compose_preseed.py	2015-11-12 19:17:29 +0000
72
@@ -38,7 +38,11 @@
73
38
)
38
)
74
39
from provisioningserver.testing.os import make_osystem
39
from provisioningserver.testing.os import make_osystem
75
40
from testtools.matchers import (
40
from testtools.matchers import (
76
41
    ContainsDict,
77
42
    Equals,
78
41
    KeysEqual,
43
    KeysEqual,
79
44
    MatchesDict,
80
45
    MatchesListwise,
81
42
    StartsWith,
46
    StartsWith,
82
43
)
47
)
83
44
import yaml
48
import yaml
84
@@ -46,6 +50,44 @@
85
46
50
86
47
class TestComposePreseed(MAASServerTestCase):
51
class TestComposePreseed(MAASServerTestCase):
87
48
52
88
53
    def assertSystemInfo(self, config):
89
54
        self.assertThat(config, ContainsDict({
90
55
            'system_info': MatchesDict({
91
56
                'package_mirrors': MatchesListwise([
92
57
                    MatchesDict({
93
58
                        "arches": Equals(["i386", "amd64"]),
94
59
                        "search": MatchesDict({
95
60
                            "primary": Equals(
96
61
                                [Config.objects.get_config("main_archive")]),
97
62
                            "security": Equals(
98
63
                                [Config.objects.get_config("main_archive")]),
99
64
                            }),
100
65
                        "failsafe": MatchesDict({
101
66
                            "primary": Equals(
102
67
                                "http://archive.ubuntu.com/ubuntu"),
103
68
                            "security": Equals(
104
69
                                "http://security.ubuntu.com/ubuntu"),
105
70
                            })
106
71
                        }),
107
72
                    MatchesDict({
108
73
                        "arches": Equals(["default"]),
109
74
                        "search": MatchesDict({
110
75
                            "primary": Equals(
111
76
                                [Config.objects.get_config("ports_archive")]),
112
77
                            "security": Equals(
113
78
                                [Config.objects.get_config("ports_archive")]),
114
79
                            }),
115
80
                        "failsafe": MatchesDict({
116
81
                            "primary": Equals(
117
82
                                "http://ports.ubuntu.com/ubuntu-ports"),
118
83
                            "security": Equals(
119
84
                                "http://ports.ubuntu.com/ubuntu-ports"),
120
85
                            })
121
86
                        }),
122
87
                    ]),
123
88
                }),
124
89
            }))
125
90
126
49
    def test_compose_preseed_for_commissioning_node_skips_apt_proxy(self):
91
    def test_compose_preseed_for_commissioning_node_skips_apt_proxy(self):
127
50
        node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
92
        node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
128
51
        Config.objects.set_config("enable_http_proxy", False)
93
        Config.objects.set_config("enable_http_proxy", False)
129
@@ -70,6 +112,7 @@
130
70
            KeysEqual(
112
            KeysEqual(
131
71
                'consumer_key', 'endpoint', 'token_key', 'token_secret',
113
                'consumer_key', 'endpoint', 'token_key', 'token_secret',
132
72
                'type'))
114
                'type'))
133
115
        self.assertSystemInfo(preseed)
134
73
116
135
74
    def test_compose_preseed_for_commissioning_node_has_header(self):
117
    def test_compose_preseed_for_commissioning_node_has_header(self):
136
75
        node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
118
        node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
137
@@ -150,6 +193,7 @@
138
150
        self.assertTrue(data["apt_preserve_sources_list"])
193
        self.assertTrue(data["apt_preserve_sources_list"])
139
151
        self.assertEqual(apt_proxy, data["apt_proxy"])
194
        self.assertEqual(apt_proxy, data["apt_proxy"])
140
152
        self.assertTrue(data["manual_cache_clean"])
195
        self.assertTrue(data["manual_cache_clean"])
141
196
        self.assertSystemInfo(data)
142
153
197
143
154
    def test_compose_preseed_skips_apt_proxy(self):
198
    def test_compose_preseed_skips_apt_proxy(self):
144
155
        node = factory.make_Node(status=NODE_STATUS.READY)
199
        node = factory.make_Node(status=NODE_STATUS.READY)
145
@@ -178,6 +222,7 @@
146
178
            absolute_reverse('curtin-metadata'),
222
            absolute_reverse('curtin-metadata'),
147
179
            preseed['datasource']['MAAS']['metadata_url'])
223
            preseed['datasource']['MAAS']['metadata_url'])
148
180
        self.assertEqual(apt_proxy, preseed['apt_proxy'])
224
        self.assertEqual(apt_proxy, preseed['apt_proxy'])
149
225
        self.assertSystemInfo(preseed)
150
181
226
151
182
    def test_compose_preseed_with_curtin_installer_skips_apt_proxy(self):
227
    def test_compose_preseed_with_curtin_installer_skips_apt_proxy(self):
152
183
        node = factory.make_Node(
228
        node = factory.make_Node(
Reviewer	Review Type	Date Requested	Status
Mike Pontillo (community)		2015-11-12	Approve on 2015-11-12
Review via email: mp+277377@code.launchpad.net