The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/1852
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
From b3a08fe8ad4a9556b335d81b98a71acda5a3ae88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com> Date: Tue, 5 Apr 2016 14:31:25 -0400 Subject: [PATCH] lxcbr0 is no more MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber <stgra...@ubuntu.com> --- doc/configuration.md | 4 ++-- doc/rest-api.md | 12 ++++++------ lxc/profile.go | 2 +- lxd/db_profiles.go | 2 +- lxd/db_update.go | 2 +- po/de.po | 4 ++-- po/fr.po | 2 +- po/ja.po | 2 +- po/lxd.pot | 2 +- test/suites/config.sh | 6 +++--- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/configuration.md b/doc/configuration.md index ae55796..599c3b5 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -259,7 +259,7 @@ coming from the profiles. If not present, LXD will create a "default" profile which comes with a -network interface connected to LXD's default bridge (lxcbr0). +network interface connected to LXD's default bridge (lxdbr0). The "default" profile is set for any new container created which doesn't specify a different profiles list. @@ -277,7 +277,7 @@ configurations would look like: 'security.privileged': 'true' }, 'devices': { - 'nic-lxcbr0': { + 'nic-lxdbr0': { 'type': 'none' }, 'nic-mybr0': { diff --git a/doc/rest-api.md b/doc/rest-api.md index 915883e..ef2afc9 100644 --- a/doc/rest-api.md +++ b/doc/rest-api.md @@ -496,7 +496,7 @@ Output: "eth0": { "name": "eth0", "nictype": "bridged", - "parent": "lxcbr0", + "parent": "lxdbr0", "type": "nic" }, "root": { @@ -677,7 +677,7 @@ HTTP code for this should be 202 (Accepted). "state": "up", "type": "loopback" }, - "lxcbr0": { + "lxdbr0": { "addresses": [ { "family": "inet", @@ -839,7 +839,7 @@ Return: "eth0": { "name": "eth0", "nictype": "bridged", - "parent": "lxcbr0", + "parent": "lxdbr0", "type": "nic" }, "root": { @@ -858,7 +858,7 @@ Return: "eth0": { "name": "eth0", "nictype": "bridged", - "parent": "lxcbr0", + "parent": "lxdbr0", "type": "nic" }, "root": { @@ -1336,7 +1336,7 @@ Input (none at present): [ "/1.0/networks/eth0",, - "/1.0/networks/lxcbr0" + "/1.0/networks/lxdbr0" ] ## /1.0/networks/\<name\> @@ -1347,7 +1347,7 @@ Input (none at present): * Return: dict representing a network { - "name": "lxcbr0", + "name": "lxdbr0", "type": "bridge", "used_by": [ "/1.0/containers/blah" diff --git a/lxc/profile.go b/lxc/profile.go index a85c9c4..0c6cdd1 100644 --- a/lxc/profile.go +++ b/lxc/profile.go @@ -38,7 +38,7 @@ func (c *profileCmd) profileEditHelp() string { ### devices: ### eth0: ### nictype: bridged -### parent: lxcbr0 +### parent: lxdbr0 ### type: nic ### ### Note that the name is shown but cannot be changed`) diff --git a/lxd/db_profiles.go b/lxd/db_profiles.go index 4e58b0b..d97f974 100644 --- a/lxd/db_profiles.go +++ b/lxd/db_profiles.go @@ -110,7 +110,7 @@ func dbProfileCreateDefault(db *sql.DB) error { "name": "eth0", "type": "nic", "nictype": "bridged", - "parent": "lxcbr0"}} + "parent": "lxdbr0"}} id, err := dbProfileCreate(db, "default", "Default LXD profile", map[string]string{}, devices) if err != nil { return err diff --git a/lxd/db_update.go b/lxd/db_update.go index 7637a26..d5c6956 100644 --- a/lxd/db_update.go +++ b/lxd/db_update.go @@ -713,7 +713,7 @@ func dbUpdateFromV3(db *sql.DB) error { INSERT INTO profiles_devices (profile_id, name, type) SELECT id, "eth0", "nic" FROM profiles WHERE profiles.name="default"; INSERT INTO profiles_devices_config (profile_device_id, key, value) SELECT profiles_devices.id, "nictype", "bridged" FROM profiles_devices LEFT JOIN profiles ON profiles.id=profiles_devices.profile_id WHERE profiles.name == "default"; INSERT INTO profiles_devices_config (profile_device_id, key, value) SELECT profiles_devices.id, 'name', "eth0" FROM profiles_devices LEFT JOIN profiles ON profiles.id=profiles_devices.profile_id WHERE profiles.name == "default"; -INSERT INTO profiles_devices_config (profile_device_id, key, value) SELECT profiles_devices.id, "parent", "lxcbr0" FROM profiles_devices LEFT JOIN profiles ON profiles.id=profiles_devices.profile_id WHERE profiles.name == "default";` +INSERT INTO profiles_devices_config (profile_device_id, key, value) SELECT profiles_devices.id, "parent", "lxdbr0" FROM profiles_devices LEFT JOIN profiles ON profiles.id=profiles_devices.profile_id WHERE profiles.name == "default";` db.Exec(stmt) stmt = `INSERT INTO schema (version, updated_at) VALUES (?, strftime("%s"));` diff --git a/po/de.po b/po/de.po index 7f17afe..8d7d762 100644 --- a/po/de.po +++ b/po/de.po @@ -100,7 +100,7 @@ msgid "" "### devices:\n" "### eth0:\n" "### nictype: bridged\n" -"### parent: lxcbr0\n" +"### parent: lxdbr0\n" "### type: nic\n" "###\n" "### Note that the name is shown but cannot be changed" @@ -118,7 +118,7 @@ msgstr "" "### devices:\n" "### eth0:\n" "### nictype: bridged\n" -"### parent: lxcbr0\n" +"### parent: lxdbr0\n" "### type: nic\n" "###\n" "### Der Name wird zwar angezeigt, lässt sich jedoch nicht ändern.\n" diff --git a/po/fr.po b/po/fr.po index 264a2fd..c794b71 100644 --- a/po/fr.po +++ b/po/fr.po @@ -74,7 +74,7 @@ msgid "" "### devices:\n" "### eth0:\n" "### nictype: bridged\n" -"### parent: lxcbr0\n" +"### parent: lxdbr0\n" "### type: nic\n" "###\n" "### Note that the name is shown but cannot be changed" diff --git a/po/ja.po b/po/ja.po index 5da88a7..d1cf8fd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -74,7 +74,7 @@ msgid "" "### devices:\n" "### eth0:\n" "### nictype: bridged\n" -"### parent: lxcbr0\n" +"### parent: lxdbr0\n" "### type: nic\n" "###\n" "### Note that the name is shown but cannot be changed" diff --git a/po/lxd.pot b/po/lxd.pot index cb28707..fbd8c43 100644 --- a/po/lxd.pot +++ b/po/lxd.pot @@ -71,7 +71,7 @@ msgid "### This is a yaml representation of the profile.\n" "### devices:\n" "### eth0:\n" "### nictype: bridged\n" - "### parent: lxcbr0\n" + "### parent: lxdbr0\n" "### type: nic\n" "###\n" "### Note that the name is shown but cannot be changed" diff --git a/test/suites/config.sh b/test/suites/config.sh index 7a8bda8..6613727 100644 --- a/test/suites/config.sh +++ b/test/suites/config.sh @@ -104,7 +104,7 @@ test_config_profiles() { mkdir -p "${TEST_DIR}/mnt1" lxc config device add foo mnt1 disk source="${TEST_DIR}/mnt1" path=/mnt1 readonly=true lxc profile create onenic - lxc profile device add onenic eth0 nic nictype=bridged parent=lxcbr0 + lxc profile device add onenic eth0 nic nictype=bridged parent=lxdbr0 lxc profile apply foo onenic lxc profile create unconfined lxc profile set unconfined raw.lxc "lxc.aa_profile=unconfined" @@ -115,7 +115,7 @@ test_config_profiles() { lxc config show foo | grep "onenic" -A1 | grep "unconfined" lxc profile list | grep onenic lxc profile device list onenic | grep eth0 - lxc profile device show onenic | grep lxcbr0 + lxc profile device show onenic | grep lxdbr0 # test live-adding a nic lxc start foo @@ -123,7 +123,7 @@ test_config_profiles() { lxc config show foo --expanded | grep -q "raw.lxc" ! lxc config show foo | grep -v "volatile.eth0" | grep -q "eth0" lxc config show foo --expanded | grep -v "volatile.eth0" | grep -q "eth0" - lxc config device add foo eth2 nic nictype=bridged parent=lxcbr0 name=eth10 + lxc config device add foo eth2 nic nictype=bridged parent=lxdbr0 name=eth10 lxc exec foo -- /sbin/ifconfig -a | grep eth0 lxc exec foo -- /sbin/ifconfig -a | grep eth10 lxc config device list foo | grep eth2
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel