-
Committer:
Scott Moser
-
Date:
2016-04-08 20:56:47 UTC
-
mfrom:
(366.2.8 trunk.test-vlan)
-
Revision ID:
smoser@ubuntu.com-20160408205647-m32ev83zbtnovssr
disable cloud-init networking
Curtin provides networking information statically into the system.
cloud-init's networking discovery and fallback is used in other
cases where no explicit networking is provided.
In theory they should be able to live side by side without disabling
cloud-init, however:
* the next commit (vlan fixes) seems to have issues without disabling
cloud-init networking.
* best case, having both of these network configurations written is
still confusing.
cloud-init's networking should be effectively disabled because curtin
writes
/etc/udev/rules.d/70-persistent-net.rules
while cloud-init writes .link files into
/etc/systemd/network/50-cloud-init-*.link
Also, curtin's ENI stanzas would be consumed before
cloud-init's ENI changes in /etc/network/interfaces.d/50-cloud-init.cfg
-------------- this line and the following will be ignored --------------
modified:
curtin/net/__init__.py
unknown:
20160305.txt
20160308.txt
all.json
better-multipath-hack.diff
boot-initrd
curtin-common_0.1.0~bzr359-0ubuntu1_all.deb
curtin-common_0.1.0~bzr365-0ubuntu1_all.deb
curtin-python2_0.1.0~bzr359-0ubuntu1_all.deb
curtin.egg-info/
curtin_0.1.0~bzr359-0ubuntu1.debian.tar.xz
curtin_0.1.0~bzr359-0ubuntu1.dsc
curtin_0.1.0~bzr359-0ubuntu1_all.deb
curtin_0.1.0~bzr359-0ubuntu1_amd64.build@
curtin_0.1.0~bzr359-0ubuntu1_amd64.changes
curtin_0.1.0~bzr359-0ubuntu1_source.build
curtin_0.1.0~bzr359-0ubuntu1_source.changes
curtin_0.1.0~bzr359.orig.tar.gz
curtin_0.1.0~bzr365-0ubuntu1.debian.tar.xz
curtin_0.1.0~bzr365-0ubuntu1.dsc
curtin_0.1.0~bzr365-0ubuntu1_all.deb
curtin_0.1.0~bzr365-0ubuntu1_amd64.build@
curtin_0.1.0~bzr365-0ubuntu1_amd64.changes
curtin_0.1.0~bzr365-0ubuntu1_source.build
curtin_0.1.0~bzr365-0ubuntu1_source.changes
curtin_0.1.0~bzr365.orig.tar.gz
foo
max.json
msg
my.py
out
out.diff
out.log
out.svg
out3.log
python-curtin_0.1.0~bzr359-0ubuntu1_all.deb
python-curtin_0.1.0~bzr365-0ubuntu1_all.deb
python3-curtin_0.1.0~bzr359-0ubuntu1_all.deb
python3-curtin_0.1.0~bzr365-0ubuntu1_all.deb
rootfs.tar.xz
save-curtin-python2.diff
tags
xenial-core-amd64.tar.gz
debian/curtin-python2.install
pending merges:
ryan harper 2016-04-07 use util.write_file for writing network configuration files
ryan harper 2016-04-06 vmtests: enhance vlan testing on all releases
ryan harper 2016-04-05 fix up vlan test-case
ryan harper 2016-04-05 convert before concat
ryan harper 2016-04-05 [merge] from trunk
ryan harper 2016-04-05 vmtests/vlan: expand vlan test-case to check iface is configured with vlan_id
ryan harper 2016-04-04 vmtests: add vlan testcase
ryan harper 2016-04-04 [merge] from trunk