summaryrefslogtreecommitdiffstats
path: root/share/doc/examples
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-05-18 18:28:46 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-05-18 18:29:07 +0000
commitb90ddebe1d1cb49c30c3a9d99119e3b0d14995fd (patch)
treea462154b0ea87956dca914338f88544f205ba06a /share/doc/examples
parentReleasing debian version 20160501-1. (diff)
downloadopen-infrastructure-compute-tools-b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd.tar.xz
open-infrastructure-compute-tools-b90ddebe1d1cb49c30c3a9d99119e3b0d14995fd.zip
Merging upstream version 20160515.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share/doc/examples')
-rw-r--r--share/doc/examples/cairon-backports.cfg1
-rw-r--r--share/doc/examples/jessie.cfg2
2 files changed, 2 insertions, 1 deletions
diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg
index 2fca922..dd459f2 100644
--- a/share/doc/examples/cairon-backports.cfg
+++ b/share/doc/examples/cairon-backports.cfg
@@ -30,6 +30,7 @@ container-tools cnt-debconf/root-password string progress
# Network IP configuration
container-tools cnt-debconf/network0/bridge string br0
+container-tools cnt-debconf/network0/veth string veth0
container-tools cnt-debconf/network0/ipv4-method select static
container-tools cnt-debconf/network0/ipv4-comment string Primary network interfaces
container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2
diff --git a/share/doc/examples/jessie.cfg b/share/doc/examples/jessie.cfg
index e9f9d46..0ec33e6 100644
--- a/share/doc/examples/jessie.cfg
+++ b/share/doc/examples/jessie.cfg
@@ -28,5 +28,5 @@ container-tools cnt-debconf/packages string openssh-server
container-tools cnt-debconf/root-password string debian
#container-tools cnt-debconf/root-password-crypted string
-container-tools cnt-debconf/network-bridge string br0
+container-tools cnt-debconf/network0/bridge string br0
#container-tools cnt-debconf/network-mac string