diff -Nru autopkgtest-4.3/debian/changelog autopkgtest-4.3ubuntu1/debian/changelog --- autopkgtest-4.3/debian/changelog 2017-01-11 11:34:09.000000000 +0000 +++ autopkgtest-4.3ubuntu1/debian/changelog 2017-02-17 05:07:09.000000000 +0000 @@ -1,3 +1,9 @@ +autopkgtest (4.3ubuntu1) zesty; urgency=medium + + * Update debian/tests/lxd to support LXD storage API. + + -- Stéphane Graber Fri, 17 Feb 2017 00:07:09 -0500 + autopkgtest (4.3) unstable; urgency=medium [ SZALAY Attila ] diff -Nru autopkgtest-4.3/debian/control autopkgtest-4.3ubuntu1/debian/control --- autopkgtest-4.3/debian/control 2017-01-11 11:34:09.000000000 +0000 +++ autopkgtest-4.3ubuntu1/debian/control 2017-02-17 05:07:09.000000000 +0000 @@ -1,5 +1,6 @@ Source: autopkgtest -Maintainer: Autopkgtest team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Autopkgtest team Uploaders: Ian Jackson , Martin Pitt Section: devel Priority: optional diff -Nru autopkgtest-4.3/debian/tests/lxd autopkgtest-4.3ubuntu1/debian/tests/lxd --- autopkgtest-4.3/debian/tests/lxd 2017-01-11 11:34:09.000000000 +0000 +++ autopkgtest-4.3ubuntu1/debian/tests/lxd 2017-02-17 05:07:05.000000000 +0000 @@ -7,7 +7,16 @@ exit 0 fi -if [ -e /etc/default/lxd-bridge ]; then +# Detect LXD API extensions +lxd_extension() { + lxc info | grep -q "^\- ${1}$" +} + +# Configure LXD networking +if lxd_extension "network"; then + lxc network create lxdbr0 ipv4.address=10.0.8.1/24 ipv4.nat=true ipv6.address=fd3b:ba81:269c:19c4::1/64 --force-local + lxc network attach-profile lxdbr0 default eth0 --force-local +else cat < /etc/default/lxd-bridge USE_LXD_BRIDGE="true" LXD_BRIDGE="lxdbr0" @@ -26,9 +35,12 @@ LXD_IPV6_NAT="false" LXD_IPV6_PROXY="false" EOF -else - lxc network create lxdbr0 ipv4.address=10.0.8.1/24 ipv4.nat=true ipv6.address=fd3b:ba81:269c:19c4::1/64 --force-local - lxc network attach-profile lxdbr0 default eth0 --force-local +fi + +# Configure LXD storage +if lxd_extension "storage"; then + lxc storage create default dir + lxc profile device add default root disk path=/ pool=default fi # work around broken PTMU in Canonical Scalingstack