1
diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
2
index 60e3ab5..ceee952 100644
3
--- a/cloudinit/config/cc_resizefs.py
4
+++ b/cloudinit/config/cc_resizefs.py
5
@@ -33,7 +33,10 @@ disabled altogether by setting ``resize_rootfs`` to ``false``.
6
33
"""
33
"""
7
34
34
8
35
import errno
35
import errno
9
36
import getopt
10
36
import os
37
import os
11
38
import re
12
39
import shlex
13
37
import stat
40
import stat
14
38
41
15
39
from cloudinit.settings import PER_ALWAYS
42
from cloudinit.settings import PER_ALWAYS
16
@@ -58,6 +61,62 @@ def _resize_ufs(mount_point, devpth):
17
58
    return ('growfs', devpth)
61
    return ('growfs', devpth)
18
59
62
19
60
63
20
64
def _get_dumpfs_output(mount_point):
21
65
    dumpfs_res, err = util.subp(['dumpfs', '-m', mount_point])
22
66
    return dumpfs_res
23
67
24
68
25
69
def _get_gpart_output(part):
26
70
    gpart_res, err = util.subp(['gpart', 'show', part])
27
71
    return gpart_res
28
72
29
73
30
74
def _can_skip_resize_ufs(mount_point, devpth):
31
75
    # extract the current fs sector size
32
76
    """
33
77
    # dumpfs -m /
34
78
    # newfs command for / (/dev/label/rootfs)
35
79
      newfs -O 2 -U -a 4 -b 32768 -d 32768 -e 4096 -f 4096 -g 16384
36
80
            -h 64 -i 8192 -j -k 6408 -m 8 -o time -s 58719232 /dev/label/rootf
37
81
    """
38
82
    cur_fs_sz = None
39
83
    frag_sz = None
40
84
    dumpfs_res = _get_dumpfs_output(mount_point)
41
85
    for line in dumpfs_res.splitlines():
42
86
        if not line.startswith('#'):
43
87
            newfs_cmd = shlex.split(line)
44
88
            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:'
45
89
            optlist, args = getopt.getopt(newfs_cmd[1:], opt_value)
46
90
            for o, a in optlist:
47
91
                if o == "-s":
48
92
                    cur_fs_sz = int(a)
49
93
                if o == "-f":
50
94
                    frag_sz = int(a)
51
95
    # check the current partition size
52
96
    """
53
97
    # gpart show /dev/da0
54
98
=>      40  62914480  da0  GPT  (30G)
55
99
        40      1024    1  freebsd-boot  (512K)
56
100
      1064  58719232    2  freebsd-ufs  (28G)
57
101
  58720296   3145728    3  freebsd-swap  (1.5G)
58
102
  61866024   1048496       - free -  (512M)
59
103
    """
60
104
    expect_sz = None
61
105
    m = re.search('^(/dev/.+)p([0-9])$', devpth)
62
106
    gpart_res = _get_gpart_output(m.group(1))
63
107
    for line in gpart_res.splitlines():
64
108
        if re.search(r"freebsd-ufs", line):
65
109
            fields = line.split()
66
110
            expect_sz = int(fields[1])
67
111
    # Normalize the gpart sector size,
68
112
    # because the size is not exactly the same as fs size.
69
113
    normal_expect_sz = (expect_sz - expect_sz % (frag_sz / 512))
70
114
    if normal_expect_sz == cur_fs_sz:
71
115
        return True
72
116
    else:
73
117
        return False
74
118
75
119
76
61
# Do not use a dictionary as these commands should be able to be used
120
# Do not use a dictionary as these commands should be able to be used
77
62
# for multiple filesystem types if possible, e.g. one command for
121
# for multiple filesystem types if possible, e.g. one command for
78
63
# ext2, ext3 and ext4.
122
# ext2, ext3 and ext4.
79
@@ -68,9 +127,40 @@ RESIZE_FS_PREFIXES_CMDS = [
80
68
    ('ufs', _resize_ufs),
127
    ('ufs', _resize_ufs),
81
69
]
128
]
82
70
129
83
130
RESIZE_FS_PRECHECK_CMDS = {
84
131
    'ufs': _can_skip_resize_ufs
85
132
}
86
133
87
71
NOBLOCK = "noblock"
134
NOBLOCK = "noblock"
88
72
135
89
73
136
90
137
def rootdev_from_cmdline(cmdline):
91
138
    found = None
92
139
    for tok in cmdline.split():
93
140
        if tok.startswith("root="):
94
141
            found = tok[5:]
95
142
            break
96
143
    if found is None:
97
144
        return None
98
145
99
146
    if found.startswith("/dev/"):
100
147
        return found
101
148
    if found.startswith("LABEL="):
102
149
        return "/dev/disk/by-label/" + found[len("LABEL="):]
103
150
    if found.startswith("UUID="):
104
151
        return "/dev/disk/by-uuid/" + found[len("UUID="):]
105
152
106
153
    return "/dev/" + found
107
154
108
155
109
156
def can_skip_resize(fs_type, resize_what, devpth):
110
157
    fstype_lc = fs_type.lower()
111
158
    for i, func in RESIZE_FS_PRECHECK_CMDS.items():
112
159
        if fstype_lc.startswith(i):
113
160
            return func(resize_what, devpth)
114
161
    return False
115
162
116
163
117
74
def handle(name, cfg, _cloud, log, args):
164
def handle(name, cfg, _cloud, log, args):
118
75
    if len(args) != 0:
165
    if len(args) != 0:
119
76
        resize_root = args[0]
166
        resize_root = args[0]
120
@@ -139,6 +229,11 @@ def handle(name, cfg, _cloud, log, args):
121
139
        return
229
        return
122
140
230
123
141
    resizer = None
231
    resizer = None
124
232
    if can_skip_resize(fs_type, resize_what, devpth):
125
233
        log.debug("Skip resize filesystem type %s for %s",
126
234
                  fs_type, resize_what)
127
235
        return
128
236
129
142
    fstype_lc = fs_type.lower()
237
    fstype_lc = fs_type.lower()
130
143
    for (pfix, root_cmd) in RESIZE_FS_PREFIXES_CMDS:
238
    for (pfix, root_cmd) in RESIZE_FS_PREFIXES_CMDS:
131
144
        if fstype_lc.startswith(pfix):
239
        if fstype_lc.startswith(pfix):
132
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
133
index 28650b8..f56c0cf 100755
134
--- a/cloudinit/distros/__init__.py
135
+++ b/cloudinit/distros/__init__.py
136
@@ -155,6 +155,9 @@ class Distro(object):
137
155
            ns, header=header, render_hwaddress=True)
155
            ns, header=header, render_hwaddress=True)
138
156
        return self.apply_network(contents, bring_up=bring_up)
156
        return self.apply_network(contents, bring_up=bring_up)
139
157
157
140
158
    def generate_fallback_config(self):
141
159
        return net.generate_fallback_config()
142
160
143
158
    def apply_network_config(self, netconfig, bring_up=False):
161
    def apply_network_config(self, netconfig, bring_up=False):
144
159
        # apply network config netconfig
162
        # apply network config netconfig
145
160
        # This method is preferred to apply_network which only takes
163
        # This method is preferred to apply_network which only takes
146
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py
147
index 183e445..d9f31bf 100644
148
--- a/cloudinit/distros/freebsd.py
149
+++ b/cloudinit/distros/freebsd.py
150
@@ -30,6 +30,7 @@ class Distro(distros.Distro):
151
30
    login_conf_fn_bak = '/etc/login.conf.orig'
30
    login_conf_fn_bak = '/etc/login.conf.orig'
152
31
    resolv_conf_fn = '/etc/resolv.conf'
31
    resolv_conf_fn = '/etc/resolv.conf'
153
32
    ci_sudoers_fn = '/usr/local/etc/sudoers.d/90-cloud-init-users'
32
    ci_sudoers_fn = '/usr/local/etc/sudoers.d/90-cloud-init-users'
154
33
    default_primary_nic = 'hn0'
155
33
34
156
34
    def __init__(self, name, cfg, paths):
35
    def __init__(self, name, cfg, paths):
157
35
        distros.Distro.__init__(self, name, cfg, paths)
36
        distros.Distro.__init__(self, name, cfg, paths)
158
@@ -38,6 +39,8 @@ class Distro(distros.Distro):
159
38
        # should only happen say once per instance...)
39
        # should only happen say once per instance...)
160
39
        self._runner = helpers.Runners(paths)
40
        self._runner = helpers.Runners(paths)
161
40
        self.osfamily = 'freebsd'
41
        self.osfamily = 'freebsd'
162
42
        self.ipv4_pat = re.compile(r"\s+inet\s+\d+[.]\d+[.]\d+[.]\d+")
163
43
        cfg['ssh_svcname'] = 'sshd'
164
41
44
165
42
    # Updates a key in /etc/rc.conf.
45
    # Updates a key in /etc/rc.conf.
166
43
    def updatercconf(self, key, value):
46
    def updatercconf(self, key, value):
167
@@ -183,7 +186,6 @@ class Distro(distros.Distro):
168
183
            "gecos": '-c',
186
            "gecos": '-c',
169
184
            "primary_group": '-g',
187
            "primary_group": '-g',
170
185
            "groups": '-G',
188
            "groups": '-G',
171
186
            "passwd": '-h',
172
187
            "shell": '-s',
189
            "shell": '-s',
173
188
            "inactive": '-E',
190
            "inactive": '-E',
174
189
        }
191
        }
175
@@ -193,19 +195,11 @@ class Distro(distros.Distro):
176
193
            "no_log_init": '--no-log-init',
195
            "no_log_init": '--no-log-init',
177
194
        }
196
        }
178
195
197
179
196
        redact_opts = ['passwd']
180
197
181
198
        for key, val in kwargs.items():
198
        for key, val in kwargs.items():
182
199
            if (key in adduser_opts and val and
199
            if (key in adduser_opts and val and
183
200
               isinstance(val, six.string_types)):
200
               isinstance(val, six.string_types)):
184
201
                adduser_cmd.extend([adduser_opts[key], val])
201
                adduser_cmd.extend([adduser_opts[key], val])
185
202
202
186
203
                # Redact certain fields from the logs
187
204
                if key in redact_opts:
188
205
                    log_adduser_cmd.extend([adduser_opts[key], 'REDACTED'])
189
206
                else:
190
207
                    log_adduser_cmd.extend([adduser_opts[key], val])
191
208
192
209
            elif key in adduser_flags and val:
203
            elif key in adduser_flags and val:
193
210
                adduser_cmd.append(adduser_flags[key])
204
                adduser_cmd.append(adduser_flags[key])
194
211
                log_adduser_cmd.append(adduser_flags[key])
205
                log_adduser_cmd.append(adduser_flags[key])
195
@@ -226,19 +220,21 @@ class Distro(distros.Distro):
196
226
        except Exception as e:
220
        except Exception as e:
197
227
            util.logexc(LOG, "Failed to create user %s", name)
221
            util.logexc(LOG, "Failed to create user %s", name)
198
228
            raise e
222
            raise e
199
223
        # Set the password if it is provided
200
224
        # For security consideration, only hashed passwd is assumed
201
225
        passwd_val = kwargs.get('passwd', None)
202
226
        if passwd_val is not None:
203
227
            self.set_passwd(name, passwd_val, hashed=True)
204
229
228
205
230
    def set_passwd(self, user, passwd, hashed=False):
229
    def set_passwd(self, user, passwd, hashed=False):
206
231
        cmd = ['pw', 'usermod', user]
207
232
208
233
        if hashed:
230
        if hashed:
210
234
            cmd.append('-H')
231
            hash_opt = "-H"
211
235
        else:
232
        else:
215
236
            cmd.append('-h')
233
            hash_opt = "-h"
213
237
214
238
        cmd.append('0')
216
239
234
217
240
        try:
235
        try:
219
241
            util.subp(cmd, passwd, logstring="chpasswd for %s" % user)
236
            util.subp(['pw', 'usermod', user, hash_opt, '0'],
220
237
                      data=passwd, logstring="chpasswd for %s" % user)
221
242
        except Exception as e:
238
        except Exception as e:
222
243
            util.logexc(LOG, "Failed to set password for %s", user)
239
            util.logexc(LOG, "Failed to set password for %s", user)
223
244
            raise e
240
            raise e
224
@@ -271,6 +267,255 @@ class Distro(distros.Distro):
225
271
            keys = set(kwargs['ssh_authorized_keys']) or []
267
            keys = set(kwargs['ssh_authorized_keys']) or []
226
272
            ssh_util.setup_user_keys(keys, name, options=None)
268
            ssh_util.setup_user_keys(keys, name, options=None)
227
273
269
228
270
    @staticmethod
229
271
    def get_ifconfig_list():
230
272
        cmd = ['ifconfig', '-l']
231
273
        (nics, err) = util.subp(cmd, rcs=[0, 1])
232
274
        if len(err):
233
275
            LOG.warn("Error running %s: %s", cmd, err)
234
276
            return None
235
277
        return nics
236
278
237
279
    @staticmethod
238
280
    def get_ifconfig_ifname_out(ifname):
239
281
        cmd = ['ifconfig', ifname]
240
282
        (if_result, err) = util.subp(cmd, rcs=[0, 1])
241
283
        if len(err):
242
284
            LOG.warn("Error running %s: %s", cmd, err)
243
285
            return None
244
286
        return if_result
245
287
246
288
    @staticmethod
247
289
    def get_ifconfig_ether():
248
290
        cmd = ['ifconfig', '-l', 'ether']
249
291
        (nics, err) = util.subp(cmd, rcs=[0, 1])
250
292
        if len(err):
251
293
            LOG.warn("Error running %s: %s", cmd, err)
252
294
            return None
253
295
        return nics
254
296
255
297
    @staticmethod
256
298
    def get_interface_mac(ifname):
257
299
        if_result = Distro.get_ifconfig_ifname_out(ifname)
258
300
        for item in if_result.splitlines():
259
301
            if item.find('ether ') != -1:
260
302
                mac = str(item.split()[1])
261
303
                if mac:
262
304
                    return mac
263
305
264
306
    @staticmethod
265
307
    def get_devicelist():
266
308
        nics = Distro.get_ifconfig_list()
267
309
        return nics.split()
268
310
269
311
    @staticmethod
270
312
    def get_ipv6():
271
313
        ipv6 = []
272
314
        nics = Distro.get_devicelist()
273
315
        for nic in nics:
274
316
            if_result = Distro.get_ifconfig_ifname_out(nic)
275
317
            for item in if_result.splitlines():
276
318
                if item.find("inet6 ") != -1 and item.find("scopeid") == -1:
277
319
                    ipv6.append(nic)
278
320
        return ipv6
279
321
280
322
    def get_ipv4(self):
281
323
        ipv4 = []
282
324
        nics = Distro.get_devicelist()
283
325
        for nic in nics:
284
326
            if_result = Distro.get_ifconfig_ifname_out(nic)
285
327
            for item in if_result.splitlines():
286
328
                print(item)
287
329
                if self.ipv4_pat.match(item):
288
330
                    ipv4.append(nic)
289
331
        return ipv4
290
332
291
333
    def is_up(self, ifname):
292
334
        if_result = Distro.get_ifconfig_ifname_out(ifname)
293
335
        pat = "^" + ifname
294
336
        for item in if_result.splitlines():
295
337
            if re.match(pat, item):
296
338
                flags = item.split('<')[1].split('>')[0]
297
339
                if flags.find("UP") != -1:
298
340
                    return True
299
341
300
342
    def _get_current_rename_info(self, check_downable=True):
301
343
        """Collect information necessary for rename_interfaces."""
302
344
        names = Distro.get_devicelist()
303
345
        bymac = {}
304
346
        for n in names:
305
347
            bymac[Distro.get_interface_mac(n)] = {
306
348
                'name': n, 'up': self.is_up(n), 'downable': None}
307
349
308
350
        if check_downable:
309
351
            nics_with_addresses = set()
310
352
            ipv6 = self.get_ipv6()
311
353
            ipv4 = self.get_ipv4()
312
354
            for bytes_out in (ipv6, ipv4):
313
355
                for i in ipv6:
314
356
                    nics_with_addresses.update(i)
315
357
                for i in ipv4:
316
358
                    nics_with_addresses.update(i)
317
359
318
360
        for d in bymac.values():
319
361
            d['downable'] = (d['up'] is False or
320
362
                             d['name'] not in nics_with_addresses)
321
363
322
364
        return bymac
323
365
324
366
    def _rename_interfaces(self, renames):
325
367
        if not len(renames):
326
368
            LOG.debug("no interfaces to rename")
327
369
            return
328
370
329
371
        current_info = self._get_current_rename_info()
330
372
331
373
        cur_bymac = {}
332
374
        for mac, data in current_info.items():
333
375
            cur = data.copy()
334
376
            cur['mac'] = mac
335
377
            cur_bymac[mac] = cur
336
378
337
379
        def update_byname(bymac):
338
380
            return dict((data['name'], data)
339
381
                        for data in bymac.values())
340
382
341
383
        def rename(cur, new):
342
384
            util.subp(["ifconfig", cur, "name", new], capture=True)
343
385
344
386
        def down(name):
345
387
            util.subp(["ifconfig", name, "down"], capture=True)
346
388
347
389
        def up(name):
348
390
            util.subp(["ifconfig", name, "up"], capture=True)
349
391
350
392
        ops = []
351
393
        errors = []
352
394
        ups = []
353
395
        cur_byname = update_byname(cur_bymac)
354
396
        tmpname_fmt = "cirename%d"
355
397
        tmpi = -1
356
398
357
399
        for mac, new_name in renames:
358
400
            cur = cur_bymac.get(mac, {})
359
401
            cur_name = cur.get('name')
360
402
            cur_ops = []
361
403
            if cur_name == new_name:
362
404
                # nothing to do
363
405
                continue
364
406
365
407
            if not cur_name:
366
408
                errors.append("[nic not present] Cannot rename mac=%s to %s"
367
409
                              ", not available." % (mac, new_name))
368
410
                continue
369
411
370
412
            if cur['up']:
371
413
                msg = "[busy] Error renaming mac=%s from %s to %s"
372
414
                if not cur['downable']:
373
415
                    errors.append(msg % (mac, cur_name, new_name))
374
416
                    continue
375
417
                cur['up'] = False
376
418
                cur_ops.append(("down", mac, new_name, (cur_name,)))
377
419
                ups.append(("up", mac, new_name, (new_name,)))
378
420
379
421
            if new_name in cur_byname:
380
422
                target = cur_byname[new_name]
381
423
                if target['up']:
382
424
                    msg = "[busy-target] Error renaming mac=%s from %s to %s."
383
425
                    if not target['downable']:
384
426
                        errors.append(msg % (mac, cur_name, new_name))
385
427
                        continue
386
428
                    else:
387
429
                        cur_ops.append(("down", mac, new_name, (new_name,)))
388
430
389
431
                tmp_name = None
390
432
                while tmp_name is None or tmp_name in cur_byname:
391
433
                    tmpi += 1
392
434
                    tmp_name = tmpname_fmt % tmpi
393
435
394
436
                cur_ops.append(("rename", mac, new_name, (new_name, tmp_name)))
395
437
                target['name'] = tmp_name
396
438
                cur_byname = update_byname(cur_bymac)
397
439
                if target['up']:
398
440
                    ups.append(("up", mac, new_name, (tmp_name,)))
399
441
400
442
            cur_ops.append(("rename", mac, new_name, (cur['name'], new_name)))
401
443
            cur['name'] = new_name
402
444
            cur_byname = update_byname(cur_bymac)
403
445
            ops += cur_ops
404
446
405
447
        opmap = {'rename': rename, 'down': down, 'up': up}
406
448
        if len(ops) + len(ups) == 0:
407
449
            if len(errors):
408
450
                LOG.debug("unable to do any work for renaming of %s", renames)
409
451
            else:
410
452
                LOG.debug("no work necessary for renaming of %s", renames)
411
453
        else:
412
454
            LOG.debug("achieving renaming of %s with ops %s",
413
455
                      renames, ops + ups)
414
456
415
457
            for op, mac, new_name, params in ops + ups:
416
458
                try:
417
459
                    opmap.get(op)(*params)
418
460
                except Exception as e:
419
461
                    errors.append(
420
462
                        "[unknown] Error performing %s%s for %s, %s: %s" %
421
463
                        (op, params, mac, new_name, e))
422
464
        if len(errors):
423
465
            raise Exception('\n'.join(errors))
424
466
425
467
    def apply_network_config_names(self, netcfg):
426
468
        renames = []
427
469
        for ent in netcfg.get('config', {}):
428
470
            if ent.get('type') != 'physical':
429
471
                continue
430
472
            mac = ent.get('mac_address')
431
473
            name = ent.get('name')
432
474
            if not mac:
433
475
                continue
434
476
            renames.append([mac, name])
435
477
        return self._rename_interfaces(renames)
436
478
437
479
    @classmethod
438
480
    def generate_fallback_config(self):
439
481
        nics = Distro.get_ifconfig_ether()
440
482
        if nics is None:
441
483
            LOG.debug("Fail to get network interfaces")
442
484
            return None
443
485
        potential_interfaces = nics.split()
444
486
        connected = []
445
487
        for nic in potential_interfaces:
446
488
            pat = "^" + nic
447
489
            if_result = Distro.get_ifconfig_ifname_out(nic)
448
490
            for item in if_result.split("\n"):
449
491
                if re.match(pat, item):
450
492
                    flags = item.split('<')[1].split('>')[0]
451
493
                    if flags.find("RUNNING") != -1:
452
494
                        connected.append(nic)
453
495
        if connected:
454
496
            potential_interfaces = connected
455
497
        names = list(sorted(potential_interfaces))
456
498
        default_pri_nic = Distro.default_primary_nic
457
499
        if default_pri_nic in names:
458
500
            names.remove(default_pri_nic)
459
501
            names.insert(0, default_pri_nic)
460
502
        target_name = None
461
503
        target_mac = None
462
504
        for name in names:
463
505
            mac = Distro.get_interface_mac(name)
464
506
            if mac:
465
507
                target_name = name
466
508
                target_mac = mac
467
509
                break
468
510
        if target_mac and target_name:
469
511
            nconf = {'config': [], 'version': 1}
470
512
            nconf['config'].append(
471
513
                {'type': 'physical', 'name': target_name,
472
514
                 'mac_address': target_mac, 'subnets': [{'type': 'dhcp'}]})
473
515
            return nconf
474
516
        else:
475
517
            return None
476
518
477
274
    def _write_network(self, settings):
519
    def _write_network(self, settings):
478
275
        entries = net_util.translate_network(settings)
520
        entries = net_util.translate_network(settings)
479
276
        nameservers = []
521
        nameservers = []
480
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
481
index dbafead..411960d 100644
482
--- a/cloudinit/settings.py
483
+++ b/cloudinit/settings.py
484
@@ -39,7 +39,7 @@ CFG_BUILTIN = {
485
39
    ],
39
    ],
486
40
    'def_log_file': '/var/log/cloud-init.log',
40
    'def_log_file': '/var/log/cloud-init.log',
487
41
    'log_cfgs': [],
41
    'log_cfgs': [],
489
42
    'syslog_fix_perms': ['syslog:adm', 'root:adm'],
42
    'syslog_fix_perms': ['syslog:adm', 'root:adm', 'root:wheel'],
490
43
    'system_info': {
43
    'system_info': {
491
44
        'paths': {
44
        'paths': {
492
45
            'cloud_dir': '/var/lib/cloud',
45
            'cloud_dir': '/var/lib/cloud',
493
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
494
index 04358b7..5254e18 100644
495
--- a/cloudinit/sources/DataSourceAzure.py
496
+++ b/cloudinit/sources/DataSourceAzure.py
497
@@ -10,6 +10,7 @@ import crypt
498
10
from functools import partial
10
from functools import partial
499
11
import os
11
import os
500
12
import os.path
12
import os.path
501
13
import re
502
13
import time
14
import time
503
14
from xml.dom import minidom
15
from xml.dom import minidom
504
15
import xml.etree.ElementTree as ET
16
import xml.etree.ElementTree as ET
505
@@ -32,19 +33,160 @@ BOUNCE_COMMAND = [
506
32
# azure systems will always have a resource disk, and 66-azure-ephemeral.rules
33
# azure systems will always have a resource disk, and 66-azure-ephemeral.rules
507
33
# ensures that it gets linked to this path.
34
# ensures that it gets linked to this path.
508
34
RESOURCE_DISK_PATH = '/dev/disk/cloud/azure_resource'
35
RESOURCE_DISK_PATH = '/dev/disk/cloud/azure_resource'
509
36
DEFAULT_PRIMARY_NIC = 'eth0'
510
37
LEASE_FILE = '/var/lib/dhcp/dhclient.eth0.leases'
511
38
DEFAULT_FS = 'ext4'
512
39
513
40
514
41
def find_storvscid_from_sysctl_pnpinfo(sysctl_out, deviceid):
515
42
    # extract the 'X' from dev.storvsc.X. if deviceid matches
516
43
    """
517
44
    dev.storvsc.1.%pnpinfo:
518
45
        classid=32412632-86cb-44a2-9b5c-50d1417354f5
519
46
        deviceid=00000000-0001-8899-0000-000000000000
520
47
    """
521
48
    for line in sysctl_out.splitlines():
522
49
        if re.search(r"pnpinfo", line):
523
50
            fields = line.split()
524
51
            if len(fields) >= 3:
525
52
                columns = fields[2].split('=')
526
53
                if (len(columns) >= 2 and
527
54
                        columns[0] == "deviceid" and
528
55
                        columns[1].startswith(deviceid)):
529
56
                    comps = fields[0].split('.')
530
57
                    return comps[2]
531
58
    return None
532
59
533
60
534
61
def find_busdev_from_disk(camcontrol_out, disk_drv):
535
62
    # find the scbusX from 'camcontrol devlist -b' output
536
63
    # if disk_drv matches the specified disk driver, i.e. blkvsc1
537
64
    """
538
65
    scbus0 on ata0 bus 0
539
66
    scbus1 on ata1 bus 0
540
67
    scbus2 on blkvsc0 bus 0
541
68
    scbus3 on blkvsc1 bus 0
542
69
    scbus4 on storvsc2 bus 0
543
70
    scbus5 on storvsc3 bus 0
544
71
    scbus-1 on xpt0 bus 0
545
72
    """
546
73
    for line in camcontrol_out.splitlines():
547
74
        if re.search(disk_drv, line):
548
75
            items = line.split()
549
76
            return items[0]
550
77
    return None
551
78
552
79
553
80
def find_dev_from_busdev(camcontrol_out, busdev):
554
81
    # find the daX from 'camcontrol devlist' output
555
82
    # if busdev matches the specified value, i.e. 'scbus2'
556
83
    """
557
84
    <Msft Virtual CD/ROM 1.0>          at scbus1 target 0 lun 0 (cd0,pass0)
558
85
    <Msft Virtual Disk 1.0>            at scbus2 target 0 lun 0 (da0,pass1)
559
86
    <Msft Virtual Disk 1.0>            at scbus3 target 1 lun 0 (da1,pass2)
560
87
    """
561
88
    for line in camcontrol_out.splitlines():
562
89
        if re.search(busdev, line):
563
90
            items = line.split('(')
564
91
            if len(items) == 2:
565
92
                dev_pass = items[1].split(',')
566
93
                return dev_pass[0]
567
94
    return None
568
95
569
96
570
97
def get_dev_storvsc_sysctl():
571
98
    try:
572
99
        sysctl_out, err = util.subp(['sysctl', 'dev.storvsc'])
573
100
    except util.ProcessExecutionError:
574
101
        LOG.debug("Fail to execute sysctl dev.storvsc")
575
102
        return None
576
103
    return sysctl_out
577
104
578
105
579
106
def get_camcontrol_dev_bus():
580
107
    try:
581
108
        camcontrol_b_out, err = util.subp(['camcontrol', 'devlist', '-b'])
582
109
    except util.ProcessExecutionError:
583
110
        LOG.debug("Fail to execute camcontrol devlist -b")
584
111
        return None
585
112
    return camcontrol_b_out
586
113
587
114
588
115
def get_camcontrol_dev():
589
116
    try:
590
117
        camcontrol_out, err = util.subp(['camcontrol', 'devlist'])
591
118
    except util.ProcessExecutionError:
592
119
        LOG.debug("Fail to execute camcontrol devlist")
593
120
        return None
594
121
    return camcontrol_out
595
122
596
123
597
124
def get_resource_disk_on_freebsd(port_id):
598
125
    g0 = "00000000"
599
126
    if port_id > 1:
600
127
        g0 = "00000001"
601
128
        port_id = port_id - 2
602
129
    g1 = "000" + str(port_id)
603
130
    g0g1 = "{0}-{1}".format(g0, g1)
604
131
    """
605
132
    search 'X' from
606
133
       'dev.storvsc.X.%pnpinfo:
607
134
           classid=32412632-86cb-44a2-9b5c-50d1417354f5
608
135
           deviceid=00000000-0001-8899-0000-000000000000'
609
136
    """
610
137
    sysctl_out = get_dev_storvsc_sysctl()
611
138
612
139
    storvscid = find_storvscid_from_sysctl_pnpinfo(sysctl_out, g0g1)
613
140
    if not storvscid:
614
141
        LOG.debug("Fail to find storvsc id from sysctl")
615
142
        return None
616
143
617
144
    camcontrol_b_out = get_camcontrol_dev_bus()
618
145
    camcontrol_out = get_camcontrol_dev()
619
146
    # try to find /dev/XX from 'blkvsc' device
620
147
    blkvsc = "blkvsc{0}".format(storvscid)
621
148
    scbusx = find_busdev_from_disk(camcontrol_b_out, blkvsc)
622
149
    if scbusx:
623
150
        devname = find_dev_from_busdev(camcontrol_out, scbusx)
624
151
        if devname is None:
625
152
            LOG.debug("Fail to find /dev/daX")
626
153
            return None
627
154
        return devname
628
155
    # try to find /dev/XX from 'storvsc' device
629
156
    storvsc = "storvsc{0}".format(storvscid)
630
157
    scbusx = find_busdev_from_disk(camcontrol_b_out, storvsc)
631
158
    if scbusx:
632
159
        devname = find_dev_from_busdev(camcontrol_out, scbusx)
633
160
        if devname is None:
634
161
            LOG.debug("Fail to find /dev/daX")
635
162
            return None
636
163
        return devname
637
164
    return None
638
165
639
166
# update the FreeBSD specific information
640
167
if util.is_FreeBSD():
641
168
    DEFAULT_PRIMARY_NIC = 'hn0'
642
169
    LEASE_FILE = '/var/db/dhclient.leases.hn0'
643
170
    DEFAULT_FS = 'freebsd-ufs'
644
171
    res_disk = get_resource_disk_on_freebsd(1)
645
172
    if res_disk is not None:
646
173
        LOG.debug("resource disk is not None")
647
174
        RESOURCE_DISK_PATH = "/dev/" + res_disk
648
175
    else:
649
176
        LOG.debug("resource disk is None")
650
35
177
651
36
BUILTIN_DS_CONFIG = {
178
BUILTIN_DS_CONFIG = {
652
37
    'agent_command': AGENT_START_BUILTIN,
179
    'agent_command': AGENT_START_BUILTIN,
653
38
    'data_dir': "/var/lib/waagent",
180
    'data_dir': "/var/lib/waagent",
654
39
    'set_hostname': True,
181
    'set_hostname': True,
655
40
    'hostname_bounce': {
182
    'hostname_bounce': {
657
41
        'interface': 'eth0',
183
        'interface': DEFAULT_PRIMARY_NIC,
658
42
        'policy': True,
184
        'policy': True,
659
43
        'command': BOUNCE_COMMAND,
185
        'command': BOUNCE_COMMAND,
660
44
        'hostname_command': 'hostname',
186
        'hostname_command': 'hostname',
661
45
    },
187
    },
662
46
    'disk_aliases': {'ephemeral0': RESOURCE_DISK_PATH},
188
    'disk_aliases': {'ephemeral0': RESOURCE_DISK_PATH},
664
47
    'dhclient_lease_file': '/var/lib/dhcp/dhclient.eth0.leases',
189
    'dhclient_lease_file': LEASE_FILE,
665
48
}
190
}
666
49
191
667
50
BUILTIN_CLOUD_CONFIG = {
192
BUILTIN_CLOUD_CONFIG = {
668
@@ -53,7 +195,7 @@ BUILTIN_CLOUD_CONFIG = {
669
53
                       'layout': [100],
195
                       'layout': [100],
670
54
                       'overwrite': True},
196
                       'overwrite': True},
671
55
    },
197
    },
673
56
    'fs_setup': [{'filesystem': 'ext4',
198
    'fs_setup': [{'filesystem': DEFAULT_FS,
674
57
                  'device': 'ephemeral0.1',
199
                  'device': 'ephemeral0.1',
675
58
                  'replace_fs': 'ntfs'}],
200
                  'replace_fs': 'ntfs'}],
676
59
}
201
}
677
@@ -190,7 +332,11 @@ class DataSourceAzureNet(sources.DataSource):
678
190
        for cdev in candidates:
332
        for cdev in candidates:
679
191
            try:
333
            try:
680
192
                if cdev.startswith("/dev/"):
334
                if cdev.startswith("/dev/"):
682
193
                    ret = util.mount_cb(cdev, load_azure_ds_dir)
335
                    if util.is_FreeBSD():
683
336
                        ret = util.mount_cb(cdev, load_azure_ds_dir,
684
337
                                            mtype="udf", sync=False)
685
338
                    else:
686
339
                        ret = util.mount_cb(cdev, load_azure_ds_dir)
687
194
                else:
340
                else:
688
195
                    ret = load_azure_ds_dir(cdev)
341
                    ret = load_azure_ds_dir(cdev)
689
196
342
690
@@ -218,11 +364,12 @@ class DataSourceAzureNet(sources.DataSource):
691
218
            LOG.debug("using files cached in %s", ddir)
364
            LOG.debug("using files cached in %s", ddir)
692
219
365
693
220
        # azure / hyper-v provides random data here
366
        # azure / hyper-v provides random data here
699
221
        seed = util.load_file("/sys/firmware/acpi/tables/OEM0",
367
        if not util.is_FreeBSD():
700
222
                              quiet=True, decode=False)
368
            seed = util.load_file("/sys/firmware/acpi/tables/OEM0",
701
223
        if seed:
369
                                  quiet=True, decode=False)
702
224
            self.metadata['random_seed'] = seed
370
            if seed:
703
225
371
                self.metadata['random_seed'] = seed
704
372
        # TODO. find the seed on FreeBSD platform
705
226
        # now update ds_cfg to reflect contents pass in config
373
        # now update ds_cfg to reflect contents pass in config
706
227
        user_ds_cfg = util.get_cfg_by_path(self.cfg, DS_CFG_PATH, {})
374
        user_ds_cfg = util.get_cfg_by_path(self.cfg, DS_CFG_PATH, {})
707
228
        self.ds_cfg = util.mergemanydict([user_ds_cfg, self.ds_cfg])
375
        self.ds_cfg = util.mergemanydict([user_ds_cfg, self.ds_cfg])
708
@@ -633,8 +780,19 @@ def encrypt_pass(password, salt_id="$6$"):
709
633
def list_possible_azure_ds_devs():
780
def list_possible_azure_ds_devs():
710
634
    # return a sorted list of devices that might have a azure datasource
781
    # return a sorted list of devices that might have a azure datasource
711
635
    devlist = []
782
    devlist = []
714
636
    for fstype in ("iso9660", "udf"):
783
    if util.is_FreeBSD():
715
637
        devlist.extend(util.find_devs_with("TYPE=%s" % fstype))
784
        cdrom_dev = "/dev/cd0"
716
785
        try:
717
786
            util.subp(["mount", "-o", "ro", "-t", "udf", cdrom_dev,
718
787
                       "/mnt/cdrom/secure"])
719
788
        except util.ProcessExecutionError:
720
789
            LOG.debug("Fail to mount cd")
721
790
            return devlist
722
791
        util.subp(["umount", "/mnt/cdrom/secure"])
723
792
        devlist.append(cdrom_dev)
724
793
    else:
725
794
        for fstype in ("iso9660", "udf"):
726
795
            devlist.extend(util.find_devs_with("TYPE=%s" % fstype))
727
638
796
728
639
    devlist.sort(reverse=True)
797
    devlist.sort(reverse=True)
729
640
    return devlist
798
    return devlist
730
diff --git a/cloudinit/sources/helpers/azure.py b/cloudinit/sources/helpers/azure.py
731
index 6e01aa4..e22409d 100644
732
--- a/cloudinit/sources/helpers/azure.py
733
+++ b/cloudinit/sources/helpers/azure.py
734
@@ -29,6 +29,14 @@ def cd(newdir):
735
29
        os.chdir(prevdir)
29
        os.chdir(prevdir)
736
30
30
737
31
31
738
32
def _get_dhcp_endpoint_option_name():
739
33
    if util.is_FreeBSD():
740
34
        azure_endpoint = "option-245"
741
35
    else:
742
36
        azure_endpoint = "unknown-245"
743
37
    return azure_endpoint
744
38
745
39
746
32
class AzureEndpointHttpClient(object):
40
class AzureEndpointHttpClient(object):
747
33
41
748
34
    headers = {
42
    headers = {
749
@@ -235,8 +243,9 @@ class WALinuxAgentShim(object):
750
235
        leases = []
243
        leases = []
751
236
        content = util.load_file(fallback_lease_file)
244
        content = util.load_file(fallback_lease_file)
752
237
        LOG.debug("content is %s", content)
245
        LOG.debug("content is %s", content)
753
246
        option_name = _get_dhcp_endpoint_option_name()
754
238
        for line in content.splitlines():
247
        for line in content.splitlines():
756
239
            if 'unknown-245' in line:
248
            if option_name in line:
757
240
                # Example line from Ubuntu
249
                # Example line from Ubuntu
758
241
                # option unknown-245 a8:3f:81:10;
250
                # option unknown-245 a8:3f:81:10;
759
242
                leases.append(line.strip(' ').split(' ', 2)[-1].strip(';\n"'))
251
                leases.append(line.strip(' ').split(' ', 2)[-1].strip(';\n"'))
760
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
761
index f7191b0..ad55782 100644
762
--- a/cloudinit/stages.py
763
+++ b/cloudinit/stages.py
764
@@ -624,7 +624,7 @@ class Init(object):
765
624
                return (None, loc)
624
                return (None, loc)
766
625
            if ncfg:
625
            if ncfg:
767
626
                return (ncfg, loc)
626
                return (ncfg, loc)
769
627
        return (net.generate_fallback_config(), "fallback")
627
        return (self.distro.generate_fallback_config(), "fallback")
770
628
628
771
629
    def apply_network_config(self, bring_up):
629
    def apply_network_config(self, bring_up):
772
630
        netcfg, src = self._find_networking_config()
630
        netcfg, src = self._find_networking_config()
773
diff --git a/cloudinit/util.py b/cloudinit/util.py
774
index 22af99d..27a9833 100644
775
--- a/cloudinit/util.py
776
+++ b/cloudinit/util.py
777
@@ -565,6 +565,10 @@ def is_ipv4(instr):
778
565
    return len(toks) == 4
565
    return len(toks) == 4
779
566
566
780
567
567
781
568
def is_FreeBSD():
782
569
    return system_info()['platform'].startswith('FreeBSD')
783
570
784
571
785
568
def get_cfg_option_bool(yobj, key, default=False):
572
def get_cfg_option_bool(yobj, key, default=False):
786
569
    if key not in yobj:
573
    if key not in yobj:
787
570
        return default
574
        return default
788
@@ -2055,11 +2059,56 @@ def parse_mtab(path):
789
2055
    return None
2059
    return None
790
2056
2060
791
2057
2061
792
2062
def find_freebsd_part(label_part):
793
2063
    if label_part.startswith("/dev/label/"):
794
2064
        target_label = label_part[5:]
795
2065
        (label_part, err) = subp(['glabel', 'status', '-s'])
796
2066
        for labels in label_part.split("\n"):
797
2067
            items = labels.split()
798
2068
            if len(items) > 0 and items[0].startswith(target_label):
799
2069
                label_part = items[2]
800
2070
                break
801
2071
        label_part = str(label_part)
802
2072
    return label_part
803
2073
804
2074
805
2075
def get_path_dev_freebsd(path, mnt_list):
806
2076
    path_found = None
807
2077
    for line in mnt_list.split("\n"):
808
2078
        items = line.split()
809
2079
        if (len(items) > 2 and os.path.exists(items[1] + path)):
810
2080
            path_found = line
811
2081
            break
812
2082
    return path_found
813
2083
814
2084
815
2085
def get_mount_info_freebsd(path, log=LOG):
816
2086
    (result, err) = subp(['mount', '-p', path], rcs=[0, 1])
817
2087
    if len(err):
818
2088
        # find a path if the input is not a mounting point
819
2089
        (mnt_list, err) = subp(['mount', '-p'])
820
2090
        path_found = get_path_dev_freebsd(path, mnt_list)
821
2091
        if (path_found is None):
822
2092
            return None
823
2093
        result = path_found
824
2094
    ret = result.split()
825
2095
    label_part = find_freebsd_part(ret[0])
826
2096
    return "/dev/" + label_part, ret[2], ret[1]
827
2097
828
2098
829
2058
def parse_mount(path):
2099
def parse_mount(path):
830
2059
    (mountoutput, _err) = subp("mount")
2100
    (mountoutput, _err) = subp("mount")
831
2060
    mount_locs = mountoutput.splitlines()
2101
    mount_locs = mountoutput.splitlines()
832
2061
    for line in mount_locs:
2102
    for line in mount_locs:
833
2062
        m = re.search(r'^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', line)
2103
        m = re.search(r'^(/dev/[\S]+) on (/.*) \((.+), .+, (.+)\)$', line)
834
2104
        if not m:
835
2105
            continue
836
2106
        # check whether the dev refers to a label on FreeBSD
837
2107
        # for example, if dev is '/dev/label/rootfs', we should
838
2108
        # continue finding the real device like '/dev/da0'.
839
2109
        devm = re.search('^(/dev/.+)p([0-9])$', m.group(1))
840
2110
        if (not devm and is_FreeBSD()):
841
2111
            return get_mount_info_freebsd(path)
842
2063
        devpth = m.group(1)
2112
        devpth = m.group(1)
843
2064
        mount_point = m.group(2)
2113
        mount_point = m.group(2)
844
2065
        fs_type = m.group(3)
2114
        fs_type = m.group(3)
845
@@ -2336,7 +2385,8 @@ def read_dmi_data(key):
846
2336
    uname_arch = os.uname()[4]
2385
    uname_arch = os.uname()[4]
847
2337
    if not (uname_arch == "x86_64" or
2386
    if not (uname_arch == "x86_64" or
848
2338
            (uname_arch.startswith("i") and uname_arch[2:] == "86") or
2387
            (uname_arch.startswith("i") and uname_arch[2:] == "86") or
850
2339
            uname_arch == 'aarch64'):
2388
            uname_arch == 'aarch64' or
851
2389
            uname_arch == 'amd64'):
852
2340
        LOG.debug("dmidata is not supported on %s", uname_arch)
2390
        LOG.debug("dmidata is not supported on %s", uname_arch)
853
2341
        return None
2391
        return None
854
2342
2392
855
diff --git a/config/cloud.cfg-freebsd b/config/cloud.cfg-freebsd
856
index be664f5..d666c39 100644
857
--- a/config/cloud.cfg-freebsd
858
+++ b/config/cloud.cfg-freebsd
859
@@ -5,7 +5,7 @@ syslog_fix_perms: root:wheel
860
5
5
861
6
# This should not be required, but leave it in place until the real cause of
6
# This should not be required, but leave it in place until the real cause of
862
7
# not beeing able to find -any- datasources is resolved.
7
# not beeing able to find -any- datasources is resolved.
864
8
datasource_list: ['ConfigDrive', 'OpenStack', 'Ec2']
8
datasource_list: ['ConfigDrive', 'Azure', 'OpenStack', 'Ec2']
865
9
9
866
10
# A set of users which may be applied and/or used by various modules
10
# A set of users which may be applied and/or used by various modules
867
11
# when a 'default' entry is found it will reference the 'default_user'
11
# when a 'default' entry is found it will reference the 'default_user'
868
diff --git a/setup.py b/setup.py
869
index 32a44d9..46d0521 100755
870
--- a/setup.py
871
+++ b/setup.py
872
@@ -89,7 +89,6 @@ LIB = "/lib"
873
89
if os.uname()[0] == 'FreeBSD':
89
if os.uname()[0] == 'FreeBSD':
874
90
    USR = "/usr/local"
90
    USR = "/usr/local"
875
91
    USR_LIB_EXEC = "/usr/local/lib"
91
    USR_LIB_EXEC = "/usr/local/lib"
876
92
    ETC = "/usr/local/etc"
877
93
elif os.path.isfile('/etc/redhat-release'):
92
elif os.path.isfile('/etc/redhat-release'):
878
94
    USR_LIB_EXEC = "/usr/libexec"
93
    USR_LIB_EXEC = "/usr/libexec"
879
95
94
880
@@ -164,8 +163,6 @@ else:
881
164
        (ETC + '/cloud', glob('config/*.cfg')),
163
        (ETC + '/cloud', glob('config/*.cfg')),
882
165
        (ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
164
        (ETC + '/cloud/cloud.cfg.d', glob('config/cloud.cfg.d/*')),
883
166
        (ETC + '/cloud/templates', glob('templates/*')),
165
        (ETC + '/cloud/templates', glob('templates/*')),
884
167
        (ETC + '/NetworkManager/dispatcher.d/', ['tools/hook-network-manager']),
885
168
        (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']),
886
169
        (USR_LIB_EXEC + '/cloud-init', ['tools/ds-identify',
166
        (USR_LIB_EXEC + '/cloud-init', ['tools/ds-identify',
887
170
                                        'tools/uncloud-init',
167
                                        'tools/uncloud-init',
888
171
                                        'tools/write-ssh-key-fingerprints']),
168
                                        'tools/write-ssh-key-fingerprints']),
889
@@ -174,8 +171,13 @@ else:
890
174
            [f for f in glob('doc/examples/*') if is_f(f)]),
171
            [f for f in glob('doc/examples/*') if is_f(f)]),
891
175
        (USR + '/share/doc/cloud-init/examples/seed',
172
        (USR + '/share/doc/cloud-init/examples/seed',
892
176
            [f for f in glob('doc/examples/seed/*') if is_f(f)]),
173
            [f for f in glob('doc/examples/seed/*') if is_f(f)]),
893
177
        (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')]),
894
178
    ]
174
    ]
895
175
    if os.uname()[0] != 'FreeBSD':
896
176
        data_files.append([
897
177
            (ETC + '/NetworkManager/dispatcher.d/', ['tools/hook-network-manager']),
898
178
            (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']),
899
179
            (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')])
900
180
        ])
901
179
    # Use a subclass for install that handles
181
    # Use a subclass for install that handles
902
180
    # adding on the right init system configuration files
182
    # adding on the right init system configuration files
903
181
    cmdclass = {
183
    cmdclass = {
904
diff --git a/sysvinit/freebsd/cloudconfig b/sysvinit/freebsd/cloudconfig
905
index 01bc061..e4064fa 100755
906
--- a/sysvinit/freebsd/cloudconfig
907
+++ b/sysvinit/freebsd/cloudconfig
908
@@ -7,24 +7,14 @@
909
7
. /etc/rc.subr
7
. /etc/rc.subr
910
8
8
911
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
912
10
export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
913
11
10
914
12
name="cloudconfig"
11
name="cloudconfig"
915
13
command="/usr/local/bin/cloud-init"
12
command="/usr/local/bin/cloud-init"
916
14
start_cmd="cloudconfig_start"
13
start_cmd="cloudconfig_start"
917
15
stop_cmd=":"
14
stop_cmd=":"
918
16
rcvar="cloudinit_enable"
15
rcvar="cloudinit_enable"
919
17
start_precmd="cloudinit_override"
920
18
start_cmd="cloudconfig_start"
16
start_cmd="cloudconfig_start"
921
19
17
922
20
cloudinit_override()
923
21
{
924
22
	# If there exist sysconfig/defaults variable override files use it...
925
23
	if [ -f /etc/defaults/cloud-init ]; then
926
24
		. /etc/defaults/cloud-init
927
25
	fi
928
26
}
929
27
930
28
cloudconfig_start()
18
cloudconfig_start()
931
29
{
19
{
932
30
	echo "${command} starting"
20
	echo "${command} starting"
933
diff --git a/sysvinit/freebsd/cloudfinal b/sysvinit/freebsd/cloudfinal
934
index 1b487aa..b6894c3 100755
935
--- a/sysvinit/freebsd/cloudfinal
936
+++ b/sysvinit/freebsd/cloudfinal
937
@@ -7,24 +7,14 @@
938
7
. /etc/rc.subr
7
. /etc/rc.subr
939
8
8
940
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
941
10
export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
942
11
10
943
12
name="cloudfinal"
11
name="cloudfinal"
944
13
command="/usr/local/bin/cloud-init"
12
command="/usr/local/bin/cloud-init"
945
14
start_cmd="cloudfinal_start"
13
start_cmd="cloudfinal_start"
946
15
stop_cmd=":"
14
stop_cmd=":"
947
16
rcvar="cloudinit_enable"
15
rcvar="cloudinit_enable"
948
17
start_precmd="cloudinit_override"
949
18
start_cmd="cloudfinal_start"
16
start_cmd="cloudfinal_start"
950
19
17
951
20
cloudinit_override()
952
21
{
953
22
	# If there exist sysconfig/defaults variable override files use it...
954
23
	if [ -f /etc/defaults/cloud-init ]; then
955
24
		 . /etc/defaults/cloud-init
956
25
	fi
957
26
}
958
27
959
28
cloudfinal_start()
18
cloudfinal_start()
960
29
{
19
{
961
30
	echo -n "${command} starting"
20
	echo -n "${command} starting"
962
diff --git a/sysvinit/freebsd/cloudinit b/sysvinit/freebsd/cloudinit
963
index 862eeab..3326300 100755
964
--- a/sysvinit/freebsd/cloudinit
965
+++ b/sysvinit/freebsd/cloudinit
966
@@ -7,24 +7,14 @@
967
7
. /etc/rc.subr
7
. /etc/rc.subr
968
8
8
969
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
970
10
export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
971
11
10
972
12
name="cloudinit"
11
name="cloudinit"
973
13
command="/usr/local/bin/cloud-init"
12
command="/usr/local/bin/cloud-init"
974
14
start_cmd="cloudinit_start"
13
start_cmd="cloudinit_start"
975
15
stop_cmd=":"
14
stop_cmd=":"
976
16
rcvar="cloudinit_enable"
15
rcvar="cloudinit_enable"
977
17
start_precmd="cloudinit_override"
978
18
start_cmd="cloudinit_start"
16
start_cmd="cloudinit_start"
979
19
17
980
20
cloudinit_override()
981
21
{
982
22
	# If there exist sysconfig/defaults variable override files use it...
983
23
	if [ -f /etc/defaults/cloud-init ]; then
984
24
		. /etc/defaults/cloud-init
985
25
	fi
986
26
}
987
27
988
28
cloudinit_start()
18
cloudinit_start()
989
29
{
19
{
990
30
	echo -n "${command} starting"
20
	echo -n "${command} starting"
991
diff --git a/sysvinit/freebsd/cloudinitlocal b/sysvinit/freebsd/cloudinitlocal
992
index fb342a0..11a5eb1 100755
993
--- a/sysvinit/freebsd/cloudinitlocal
994
+++ b/sysvinit/freebsd/cloudinitlocal
995
@@ -1,30 +1,20 @@
996
1
#!/bin/sh
1
#!/bin/sh
997
2
2
998
3
# PROVIDE: cloudinitlocal
3
# PROVIDE: cloudinitlocal
1000
4
# REQUIRE: mountcritlocal 
4
# REQUIRE: ldconfig mountcritlocal 
1001
5
# BEFORE:  NETWORKING FILESYSTEMS cloudinit cloudconfig cloudfinal
5
# BEFORE:  NETWORKING FILESYSTEMS cloudinit cloudconfig cloudfinal
1002
6
6
1003
7
. /etc/rc.subr
7
. /etc/rc.subr
1004
8
8
1005
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
9
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
1006
10
export CLOUD_CFG=/usr/local/etc/cloud/cloud.cfg
1007
11
10
1008
12
name="cloudinitlocal"
11
name="cloudinitlocal"
1009
13
command="/usr/local/bin/cloud-init"
12
command="/usr/local/bin/cloud-init"
1010
14
start_cmd="cloudlocal_start"
13
start_cmd="cloudlocal_start"
1011
15
stop_cmd=":"
14
stop_cmd=":"
1012
16
rcvar="cloudinit_enable"
15
rcvar="cloudinit_enable"
1013
17
start_precmd="cloudinit_override"
1014
18
start_cmd="cloudlocal_start"
16
start_cmd="cloudlocal_start"
1015
19
17
1016
20
cloudinit_override()
1017
21
{
1018
22
	# If there exist sysconfig/defaults variable override files use it...
1019
23
	if [ -f /etc/defaults/cloud-init ]; then
1020
24
		. /etc/defaults/cloud-init
1021
25
	fi
1022
26
}
1023
27
1024
28
cloudlocal_start()
18
cloudlocal_start()
1025
29
{
19
{
1026
30
	echo -n "${command} starting"
20
	echo -n "${command} starting"
1027
diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py
1028
index 8d22bb5..e6b0dcb 100644
1029
--- a/tests/unittests/test_datasource/test_azure.py
1030
+++ b/tests/unittests/test_datasource/test_azure.py
1031
@@ -3,6 +3,8 @@
1032
3
from cloudinit import helpers
3
from cloudinit import helpers
1033
4
from cloudinit.util import b64e, decode_binary, load_file
4
from cloudinit.util import b64e, decode_binary, load_file
1034
5
from cloudinit.sources import DataSourceAzure
5
from cloudinit.sources import DataSourceAzure
1035
6
from cloudinit.util import find_freebsd_part
1036
7
from cloudinit.util import get_path_dev_freebsd
1037
6
8
1038
7
from ..helpers import TestCase, populate_dir, mock, ExitStack, PY26, SkipTest
9
from ..helpers import TestCase, populate_dir, mock, ExitStack, PY26, SkipTest
1039
8
10
1040
@@ -95,6 +97,41 @@ class TestAzureDataSource(TestCase):
1041
95
        for module, name, new in patches:
97
        for module, name, new in patches:
1042
96
            self.patches.enter_context(mock.patch.object(module, name, new))
98
            self.patches.enter_context(mock.patch.object(module, name, new))
1043
97
99
1044
100
    def _get_mockds(self):
1045
101
        mod = DataSourceAzure
1046
102
        sysctl_out = "dev.storvsc.3.%pnpinfo: "\
1047
103
                     "classid=ba6163d9-04a1-4d29-b605-72e2ffb1dc7f "\
1048
104
                     "deviceid=f8b3781b-1e82-4818-a1c3-63d806ec15bb\n"
1049
105
        sysctl_out += "dev.storvsc.2.%pnpinfo: "\
1050
106
                      "classid=ba6163d9-04a1-4d29-b605-72e2ffb1dc7f "\
1051
107
                      "deviceid=f8b3781a-1e82-4818-a1c3-63d806ec15bb\n"
1052
108
        sysctl_out += "dev.storvsc.1.%pnpinfo: "\
1053
109
                      "classid=32412632-86cb-44a2-9b5c-50d1417354f5 "\
1054
110
                      "deviceid=00000000-0001-8899-0000-000000000000\n"
1055
111
        camctl_devbus = """
1056
112
scbus0 on ata0 bus 0
1057
113
scbus1 on ata1 bus 0
1058
114
scbus2 on blkvsc0 bus 0
1059
115
scbus3 on blkvsc1 bus 0
1060
116
scbus4 on storvsc2 bus 0
1061
117
scbus5 on storvsc3 bus 0
1062
118
scbus-1 on xpt0 bus 0
1063
119
        """
1064
120
        camctl_dev = """
1065
121
<Msft Virtual CD/ROM 1.0>          at scbus1 target 0 lun 0 (cd0,pass0)
1066
122
<Msft Virtual Disk 1.0>            at scbus2 target 0 lun 0 (da0,pass1)
1067
123
<Msft Virtual Disk 1.0>            at scbus3 target 1 lun 0 (da1,pass2)
1068
124
        """
1069
125
        self.apply_patches([
1070
126
            (mod, 'get_dev_storvsc_sysctl', mock.MagicMock(
1071
127
                return_value=sysctl_out)),
1072
128
            (mod, 'get_camcontrol_dev_bus', mock.MagicMock(
1073
129
                return_value=camctl_devbus)),
1074
130
            (mod, 'get_camcontrol_dev', mock.MagicMock(
1075
131
                return_value=camctl_dev))
1076
132
        ])
1077
133
        return mod
1078
134
1079
98
    def _get_ds(self, data, agent_command=None):
135
    def _get_ds(self, data, agent_command=None):
1080
99
136
1081
100
        def dsdevs():
137
        def dsdevs():
1082
@@ -177,6 +214,34 @@ class TestAzureDataSource(TestCase):
1083
177
            return
214
            return
1084
178
        raise AssertionError("XML is the same")
215
        raise AssertionError("XML is the same")
1085
179
216
1086
217
    def test_get_resource_disk(self):
1087
218
        ds = self._get_mockds()
1088
219
        dev = ds.get_resource_disk_on_freebsd(1)
1089
220
        self.assertEqual("da1", dev)
1090
221
1091
222
    @mock.patch('cloudinit.util.subp')
1092
223
    def test_find_freebsd_part_on_Azure(self, mock_subp):
1093
224
        glabel_out = '''
1094
225
gptid/fa52d426-c337-11e6-8911-00155d4c5e47  N/A  da0p1
1095
226
                              label/rootfs  N/A  da0p2
1096
227
                                label/swap  N/A  da0p3
1097
228
'''
1098
229
        mock_subp.return_value = (glabel_out, "")
1099
230
        res = find_freebsd_part("/dev/label/rootfs")
1100
231
        self.assertEqual("da0p2", res)
1101
232
1102
233
    def test_get_path_dev_freebsd_on_Azure(self):
1103
234
        mnt_list = '''
1104
235
/dev/label/rootfs  /                ufs     rw              1 1
1105
236
devfs              /dev             devfs   rw,multilabel   0 0
1106
237
fdescfs            /dev/fd          fdescfs rw              0 0
1107
238
/dev/da1s1         /mnt/resource    ufs     rw              2 2
1108
239
'''
1109
240
        with mock.patch.object(os.path, 'exists',
1110
241
                               return_value=True):
1111
242
            res = get_path_dev_freebsd('/etc', mnt_list)
1112
243
            self.assertNotEqual(res, None)
1113
244
1114
180
    def test_basic_seed_dir(self):
245
    def test_basic_seed_dir(self):
1115
181
        odata = {'HostName': "myhost", 'UserName': "myuser"}
246
        odata = {'HostName': "myhost", 'UserName': "myuser"}
1116
182
        data = {'ovfcontent': construct_valid_ovf_env(data=odata),
247
        data = {'ovfcontent': construct_valid_ovf_env(data=odata),
1117
diff --git a/tests/unittests/test_datasource/test_azure_helper.py b/tests/unittests/test_datasource/test_azure_helper.py
1118
index aafdebd..b2d2971 100644
1119
--- a/tests/unittests/test_datasource/test_azure_helper.py
1120
+++ b/tests/unittests/test_datasource/test_azure_helper.py
1121
@@ -3,7 +3,6 @@
1122
3
import os
3
import os
1123
4
4
1124
5
from cloudinit.sources.helpers import azure as azure_helper
5
from cloudinit.sources.helpers import azure as azure_helper
1125
6
1126
7
from ..helpers import ExitStack, mock, TestCase
6
from ..helpers import ExitStack, mock, TestCase
1127
8
7
1128
9
8
1129
@@ -72,10 +71,11 @@ class TestFindEndpoint(TestCase):
1130
72
71
1131
73
    @staticmethod
72
    @staticmethod
1132
74
    def _build_lease_content(encoded_address):
73
    def _build_lease_content(encoded_address):
1133
74
        endpoint = azure_helper._get_dhcp_endpoint_option_name()
1134
75
        return '\n'.join([
75
        return '\n'.join([
1135
76
            'lease {',
76
            'lease {',
1136
77
            ' interface "eth0";',
77
            ' interface "eth0";',
1138
78
            ' option unknown-245 {0};'.format(encoded_address),
78
            ' option {0} {1};'.format(endpoint, encoded_address),
1139
79
            '}'])
79
            '}'])
1140
80
80
1141
81
    def test_from_dhcp_client(self):
81
    def test_from_dhcp_client(self):
1142
diff --git a/tests/unittests/test_datasource/test_cloudstack.py b/tests/unittests/test_datasource/test_cloudstack.py
1143
index e93d28d..1d3d2f1 100644
1144
--- a/tests/unittests/test_datasource/test_cloudstack.py
1145
+++ b/tests/unittests/test_datasource/test_cloudstack.py
1146
@@ -15,6 +15,11 @@ class TestCloudStackPasswordFetching(TestCase):
1147
15
        mod_name = 'cloudinit.sources.DataSourceCloudStack'
15
        mod_name = 'cloudinit.sources.DataSourceCloudStack'
1148
16
        self.patches.enter_context(mock.patch('{0}.ec2'.format(mod_name)))
16
        self.patches.enter_context(mock.patch('{0}.ec2'.format(mod_name)))
1149
17
        self.patches.enter_context(mock.patch('{0}.uhelp'.format(mod_name)))
17
        self.patches.enter_context(mock.patch('{0}.uhelp'.format(mod_name)))
1150
18
        default_gw = "192.201.20.0"
1151
19
        mod_name = 'cloudinit.sources.DataSourceCloudStack.get_default_gateway'
1152
20
        get_default_gw = mock.MagicMock(return_value=default_gw)
1153
21
        self.patches.enter_context(
1154
22
            mock.patch(mod_name, get_default_gw))
1155
18
23
1156
19
    def _set_password_server_response(self, response_string):
24
    def _set_password_server_response(self, response_string):
1157
20
        subp = mock.MagicMock(return_value=(response_string, ''))
25
        subp = mock.MagicMock(return_value=(response_string, ''))
1158
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
1159
index 8837066..1e10a33 100644
1160
--- a/tests/unittests/test_distros/test_netconfig.py
1161
+++ b/tests/unittests/test_distros/test_netconfig.py
1162
@@ -178,6 +178,20 @@ class WriteBuffer(object):
1163
178
178
1164
179
class TestNetCfgDistro(TestCase):
179
class TestNetCfgDistro(TestCase):
1165
180
180
1166
181
    frbsd_ifout = """\
1167
182
hn0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500
1168
183
        options=51b<RXCSUM,TXCSUM,VLAN_MTU,VLAN_HWTAGGING,TSO4,LRO>
1169
184
        ether 00:15:5d:4c:73:00
1170
185
        inet6 fe80::215:5dff:fe4c:7300%hn0 prefixlen 64 scopeid 0x2
1171
186
        inet 10.156.76.127 netmask 0xfffffc00 broadcast 10.156.79.255
1172
187
        nd6 options=23<PERFORMNUD,ACCEPT_RTADV,AUTO_LINKLOCAL>
1173
188
        media: Ethernet autoselect (10Gbase-T <full-duplex>)
1174
189
        status: active
1175
190
"""
1176
191
1177
192
    def setUp(self):
1178
193
        super(TestNetCfgDistro, self).setUp()
1179
194
1180
181
    def _get_distro(self, dname, renderers=None):
195
    def _get_distro(self, dname, renderers=None):
1181
182
        cls = distros.fetch(dname)
196
        cls = distros.fetch(dname)
1182
183
        cfg = settings.CFG_BUILTIN
197
        cfg = settings.CFG_BUILTIN
1183
@@ -251,6 +265,7 @@ class TestNetCfgDistro(TestCase):
1184
251
265
1185
252
    def test_apply_network_config_v1_to_netplan_ub(self):
266
    def test_apply_network_config_v1_to_netplan_ub(self):
1186
253
        renderers = ['netplan']
267
        renderers = ['netplan']
1187
268
        devlist = ['eth0', 'lo']
1188
254
        ub_distro = self._get_distro('ubuntu', renderers=renderers)
269
        ub_distro = self._get_distro('ubuntu', renderers=renderers)
1189
255
        with ExitStack() as mocks:
270
        with ExitStack() as mocks:
1190
256
            write_bufs = {}
271
            write_bufs = {}
1191
@@ -272,6 +287,9 @@ class TestNetCfgDistro(TestCase):
1192
272
                mock.patch.object(util, 'subp', return_value=(0, 0)))
287
                mock.patch.object(util, 'subp', return_value=(0, 0)))
1193
273
            mocks.enter_context(
288
            mocks.enter_context(
1194
274
                mock.patch.object(os.path, 'isfile', return_value=False))
289
                mock.patch.object(os.path, 'isfile', return_value=False))
1195
290
            mocks.enter_context(
1196
291
                mock.patch("cloudinit.net.netplan.get_devicelist",
1197
292
                           return_value=devlist))
1198
275
293
1199
276
            ub_distro.apply_network_config(V1_NET_CFG, False)
294
            ub_distro.apply_network_config(V1_NET_CFG, False)
1200
277
295
1201
@@ -285,6 +303,7 @@ class TestNetCfgDistro(TestCase):
1202
285
303
1203
286
    def test_apply_network_config_v2_passthrough_ub(self):
304
    def test_apply_network_config_v2_passthrough_ub(self):
1204
287
        renderers = ['netplan']
305
        renderers = ['netplan']
1205
306
        devlist = ['eth0', 'lo']
1206
288
        ub_distro = self._get_distro('ubuntu', renderers=renderers)
307
        ub_distro = self._get_distro('ubuntu', renderers=renderers)
1207
289
        with ExitStack() as mocks:
308
        with ExitStack() as mocks:
1208
290
            write_bufs = {}
309
            write_bufs = {}
1209
@@ -306,7 +325,10 @@ class TestNetCfgDistro(TestCase):
1210
306
                mock.patch.object(util, 'subp', return_value=(0, 0)))
325
                mock.patch.object(util, 'subp', return_value=(0, 0)))
1211
307
            mocks.enter_context(
326
            mocks.enter_context(
1212
308
                mock.patch.object(os.path, 'isfile', return_value=False))
327
                mock.patch.object(os.path, 'isfile', return_value=False))
1214
309
328
            # FreeBSD does not have '/sys/class/net' file,
1215
329
            # so we need mock here.
1216
330
            mocks.enter_context(
1217
331
                mock.patch.object(os, 'listdir', return_value=devlist))
1218
310
            ub_distro.apply_network_config(V2_NET_CFG, False)
332
            ub_distro.apply_network_config(V2_NET_CFG, False)
1219
311
333
1220
312
            self.assertEqual(len(write_bufs), 1)
334
            self.assertEqual(len(write_bufs), 1)
1221
@@ -328,6 +350,29 @@ class TestNetCfgDistro(TestCase):
1222
328
        for (k, v) in b1.items():
350
        for (k, v) in b1.items():
1223
329
            self.assertEqual(v, b2[k])
351
            self.assertEqual(v, b2[k])
1224
330
352
1225
353
    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_list')
1226
354
    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_ifname_out')
1227
355
    def test_get_ip_nic_freebsd(self, ifname_out, iflist):
1228
356
        frbsd_distro = self._get_distro('freebsd')
1229
357
        iflist.return_value = "lo0 hn0"
1230
358
        ifname_out.return_value = self.frbsd_ifout
1231
359
        res = frbsd_distro.get_ipv4()
1232
360
        self.assertEqual(res, ['lo0', 'hn0'])
1233
361
        res = frbsd_distro.get_ipv6()
1234
362
        self.assertEqual(res, [])
1235
363
1236
364
    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_ether')
1237
365
    @mock.patch('cloudinit.distros.freebsd.Distro.get_ifconfig_ifname_out')
1238
366
    @mock.patch('cloudinit.distros.freebsd.Distro.get_interface_mac')
1239
367
    def test_generate_fallback_config_freebsd(self, mac, ifname_out, if_ether):
1240
368
        frbsd_distro = self._get_distro('freebsd')
1241
369
1242
370
        if_ether.return_value = 'hn0'
1243
371
        ifname_out.return_value = self.frbsd_ifout
1244
372
        mac.return_value = '00:15:5d:4c:73:00'
1245
373
        res = frbsd_distro.generate_fallback_config()
1246
374
        self.assertIsNotNone(res)
1247
375
1248
331
    def test_simple_write_rh(self):
376
    def test_simple_write_rh(self):
1249
332
        rh_distro = self._get_distro('rhel')
377
        rh_distro = self._get_distro('rhel')
1250
333
378
1251
diff --git a/tests/unittests/test_handler/test_handler_resizefs.py b/tests/unittests/test_handler/test_handler_resizefs.py
1252
334
new file mode 100644
379
new file mode 100644
1253
index 0000000..52591b8
1254
--- /dev/null
1255
+++ b/tests/unittests/test_handler/test_handler_resizefs.py
1256
@@ -0,0 +1,59 @@
1257
1
# This file is part of cloud-init. See LICENSE file for license information.
1258
2
1259
3
from cloudinit.config import cc_resizefs
1260
4
1261
5
import textwrap
1262
6
import unittest
1263
7
1264
8
try:
1265
9
    from unittest import mock
1266
10
except ImportError:
1267
11
    import mock
1268
12
1269
13
1270
14
class TestResizefs(unittest.TestCase):
1271
15
    def setUp(self):
1272
16
        super(TestResizefs, self).setUp()
1273
17
        self.name = "resizefs"
1274
18
1275
19
    @mock.patch('cloudinit.config.cc_resizefs._get_dumpfs_output')
1276
20
    @mock.patch('cloudinit.config.cc_resizefs._get_gpart_output')
1277
21
    def test_skip_ufs_resize(self, gpart_out, dumpfs_out):
1278
22
        fs_type = "ufs"
1279
23
        resize_what = "/"
1280
24
        devpth = "/dev/da0p2"
1281
25
        dumpfs_out.return_value = (
1282
26
            "# newfs command for / (/dev/label/rootfs)\n"
1283
27
            "newfs -O 2 -U -a 4 -b 32768 -d 32768 -e 4096 "
1284
28
            "-f 4096 -g 16384 -h 64 -i 8192 -j -k 6408 -m 8 "
1285
29
            "-o time -s 58719232 /dev/label/rootfs\n")
1286
30
        gpart_out.return_value = textwrap.dedent("""\
1287
31
            =>      40  62914480  da0  GPT  (30G)
1288
32
                    40      1024    1  freebsd-boot  (512K)
1289
33
                  1064  58719232    2  freebsd-ufs  (28G)
1290
34
              58720296   3145728    3  freebsd-swap  (1.5G)
1291
35
              61866024   1048496       - free -  (512M)
1292
36
            """)
1293
37
        res = cc_resizefs.can_skip_resize(fs_type, resize_what, devpth)
1294
38
        self.assertTrue(res)
1295
39
1296
40
    @mock.patch('cloudinit.config.cc_resizefs._get_dumpfs_output')
1297
41
    @mock.patch('cloudinit.config.cc_resizefs._get_gpart_output')
1298
42
    def test_skip_ufs_resize_roundup(self, gpart_out, dumpfs_out):
1299
43
        fs_type = "ufs"
1300
44
        resize_what = "/"
1301
45
        devpth = "/dev/da0p2"
1302
46
        dumpfs_out.return_value = (
1303
47
            "# newfs command for / (/dev/label/rootfs)\n"
1304
48
            "newfs -O 2 -U -a 4 -b 32768 -d 32768 -e 4096 "
1305
49
            "-f 4096 -g 16384 -h 64 -i 8192 -j -k 368 -m 8 "
1306
50
            "-o time -s 297080 /dev/label/rootfs\n")
1307
51
        gpart_out.return_value = textwrap.dedent("""\
1308
52
            =>      34  297086  da0  GPT  (145M)
1309
53
                    34  297086    1  freebsd-ufs  (145M)
1310
54
            """)
1311
55
        res = cc_resizefs.can_skip_resize(fs_type, resize_what, devpth)
1312
56
        self.assertTrue(res)
1313
57
1314
58
1315
59
# vi: ts=4 expandtab
1316
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
1317
index 89e7536..5d2dd03 100644
1318
--- a/tests/unittests/test_net.py
1319
+++ b/tests/unittests/test_net.py
1320
@@ -1120,14 +1120,14 @@ class TestNetplanPostcommands(CiTestCase):
1321
1120
        render_target = 'netplan.yaml'
1120
        render_target = 'netplan.yaml'
1322
1121
        renderer = netplan.Renderer(
1121
        renderer = netplan.Renderer(
1323
1122
            {'netplan_path': render_target, 'postcmds': True})
1122
            {'netplan_path': render_target, 'postcmds': True})
1324
1123
        renderer.render_network_state(render_dir, ns)
1325
1124
1326
1125
        expected = [
1123
        expected = [
1327
1126
            mock.call(['netplan', 'generate'], capture=True),
1124
            mock.call(['netplan', 'generate'], capture=True),
1328
1127
            mock.call(['udevadm', 'test-builtin', 'net_setup_link',
1125
            mock.call(['udevadm', 'test-builtin', 'net_setup_link',
1329
1128
                       '/sys/class/net/lo'], capture=True),
1126
                       '/sys/class/net/lo'], capture=True),
1330
1129
        ]
1127
        ]
1332
1130
        mock_subp.assert_has_calls(expected)
1128
        with mock.patch.object(os.path, 'islink', return_value=True):
1333
1129
            renderer.render_network_state(render_dir, ns)
1334
1130
            mock_subp.assert_has_calls(expected)
1335
1131
1131
1336
1132
1132
1337
1133
class TestEniNetworkStateToEni(CiTestCase):
1133
class TestEniNetworkStateToEni(CiTestCase):
1338
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
1339
index 5d21b4b..189caca 100644
1340
--- a/tests/unittests/test_util.py
1341
+++ b/tests/unittests/test_util.py
1342
@@ -596,7 +596,8 @@ class TestSubp(helpers.TestCase):
1343
596
    def test_subp_capture_stderr(self):
596
    def test_subp_capture_stderr(self):
1344
597
        data = b'hello world'
597
        data = b'hello world'
1345
598
        (out, err) = util.subp(self.stdin2err, capture=True,
598
        (out, err) = util.subp(self.stdin2err, capture=True,
1347
599
                               decode=False, data=data)
599
                               decode=False, data=data,
1348
600
                               update_env={'LC_ALL': 'C'})
1349
600
        self.assertEqual(err, data)
601
        self.assertEqual(err, data)
1350
601
        self.assertEqual(out, b'')
602
        self.assertEqual(out, b'')
1351
602
603
1352
diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
1353
index 8436498..ccc10b4 100755
1354
--- a/tools/build-on-freebsd
1355
+++ b/tools/build-on-freebsd
1356
@@ -10,9 +10,7 @@ depschecked=/tmp/c-i.dependencieschecked
1357
10
pkgs="
10
pkgs="
1358
11
   dmidecode
11
   dmidecode
1359
12
   e2fsprogs
12
   e2fsprogs
1360
13
   gpart
1361
14
   py27-Jinja2
13
   py27-Jinja2
1362
15
   py27-argparse
1363
16
   py27-boto
14
   py27-boto
1364
17
   py27-cheetah
15
   py27-cheetah
1365
18
   py27-configobj
16
   py27-configobj
1366
@@ -38,7 +36,7 @@ python setup.py build
1367
38
python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
36
python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
1368
39
37
1369
40
# Install the correct config file:
38
# Install the correct config file:
1371
41
cp config/cloud.cfg-freebsd /usr/local/etc/cloud/cloud.cfg
39
cp config/cloud.cfg-freebsd /etc/cloud/cloud.cfg
1372
42
40
1373
43
# Enable cloud-init in /etc/rc.conf:
41
# Enable cloud-init in /etc/rc.conf:
1374
44
sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf
42
sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf
Reviewer	Review Type	Date Requested	Status
Scott Moser		2017-01-17	Approve on 2017-05-10
Server Team CI bot	continuous-integration		Approve on 2017-05-08
Review via email: mp+314895@code.launchpad.net