Merge lp:~raharper/curtin/trunk.fix-ubuntu-core-network-config into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

uc16 curthooks: add 'network' key to config file

When deploying UC16 with a network config, ensure that we include the
top-level 'network' key for cloud-init to detect network configuration.

Update vmtest and unittest to exercise network path.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:489
https://jenkins.ubuntu.com/server/job/curtin-ci/456/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/456
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/456
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/456
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/456
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/456

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/456/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

This seems reasonable.
It seems also possible that you could shove the ubuntu install path through this path.
You could just provide a config that ahd some late_commands or somethign that removed the network config disabling that curtin does and instead writes the config as done in UC16.

[Ryan Harper (raharper)]

On Thu, Apr 20, 2017 at 4:26 PM, Scott Moser <email address hidden> wrote:

> This seems reasonable.
> It seems also possible that you could shove the ubuntu install path
> through this path.
> You could just provide a config that ahd some late_commands or somethign
> that removed the network config disabling that curtin does and instead
> writes the config as done in UC16.
>

ACK, we will hit this path when I resume pass-through networking tests.

>
>
> --
> https://code.launchpad.net/~raharper/curtin/trunk.fix-
> ubuntu-core-network-config/+merge/322880
> You are the owner of lp:~raharper/curtin/trunk.fix-
> ubuntu-core-network-config.
>

[Lee Trager (ltrager)]

I tested this with lp:~ltrager/maas/ubuntu-core-simplestreams. While Curtin successfully deploys Ubuntu Core, sends MAAS the installation output, and reboots the deployed system has no network connectivity. MAAS doesn't mark a machine as deployed until it receives a message from cloud-init on the deployed system so the status stays deploying until it times out and goes into failed deployment.

I booted into rescue mode and poked around /system-data/etc/. No interfaces are configured in /etc/network. /etc/netplan/50-cloud-init.yaml[1] is configured and looks correct but networking never comes up. I monitored network traffic during the deployment and after the system reboots it emits no traffic at all.

[1] http://paste.ubuntu.com/24428726/

review: Needs Fixing

[Ryan Harper (raharper)]

Turns out we need an updated nplan in the image.

https://bugs.launchpad.net/ubuntu/+source/nplan/+bug/1668693

I've proposed a fix; was approved but not yet landed.

https://code.launchpad.net/~raharper/netplan/+git/netplan/+merge/318545

In the meantime, I'm rebuilding the curtin UC16 image with an updated nplan
with the MTU fix applied.

[lp:~raharper/curtin/trunk.fix-ubuntu-core-network-config]

490. By Ryan Harper on 2017-04-24

Add MTU in network config to force poke nplan

491. By Ryan Harper on 2017-04-24

merge from trunk

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:491
https://jenkins.ubuntu.com/server/job/curtin-ci/472/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/472
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/472
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/472
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/472
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=vm-i386/472

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/472/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

review: Approve

[Ryan Harper (raharper)]

<rharper> ltrager: did you get a chance to update your streams with the 4/24 curtin-ubuntu-core image and see if that resolved your network config issue?

<ltrager> rharper, roaksoax: Yes I did its available at http://XXXXXXXXX/ubuntu-core/
<ltrager> I tested some basic network configs and those seem to work

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2017-03-24 16:34:05 +0000
+++ curtin/commands/curthooks.py	2017-04-24 18:13:44 +0000
@@ -738,7 +738,7 @@
         ubuntu_core_netconfig = os.path.join(cc_target,
                                              "50-network-config.cfg")
         util.write_file(ubuntu_core_netconfig,
-                        content=config.dump_config(netconfig))
+                        content=config.dump_config({'network': netconfig}))
 
 
 def target_is_ubuntu_core(target):
 
=== modified file 'examples/tests/ubuntu_core.yaml'
--- examples/tests/ubuntu_core.yaml	2017-02-17 19:29:33 +0000
+++ examples/tests/ubuntu_core.yaml	2017-04-24 18:13:44 +0000
@@ -11,3 +11,35 @@
       snappy:
         email: [e-mail]
         packages: [hello, part-numpy, part-cython]
+
+network:
+    version: 1
+    config:
+        # Physical interfaces.
+        - type: physical
+          name: interface0
+          mac_address: "52:54:00:12:34:00"
+          subnets:
+              - type: dhcp4
+        - type: physical
+          name: interface1
+          mtu: 1492
+          mac_address: "52:54:00:12:34:02"
+          subnets:
+              - type: static
+                address: 10.0.2.100/24
+              - type: static
+                address: 10.0.3.100/24
+              - type: static
+                address: 10.0.4.100/24
+              - type: static
+                address: 10.0.5.100/24
+              - type: static
+                address: 10.0.2.200/24
+                dns_nameservers:
+                  - 8.8.8.8
+                dns_search:
+                  - barley.maas
+        - type: physical
+          name: interface2
+          mac_address: "52:54:00:12:34:04"
 
=== modified file 'tests/unittests/test_curthooks.py'
--- tests/unittests/test_curthooks.py	2017-03-22 15:34:21 +0000
+++ tests/unittests/test_curthooks.py	2017-04-24 18:13:44 +0000
@@ -284,7 +284,7 @@
                                    'system-data',
                                    'etc/cloud/cloud.cfg.d',
                                    '50-network-config.cfg')
-        netcfg = config.dump_config(cfg.get('network'))
+        netcfg = config.dump_config({'network': cfg.get('network')})
         mock_write_file.assert_called_with(netcfg_path,
                                            content=netcfg)
         self.assertEqual(len(mock_del_file.call_args_list), 0)