date:20160502

[lxc-devel] [lxc/lxc] bc3b32: Improve on the case where default networking confi...

2016-05-02 Thread GitHub

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: bc3b327244e54f8890bd4d05cdeac4b2a1ec74df
  https://github.com/lxc/lxc/commit/bc3b327244e54f8890bd4d05cdeac4b2a1ec74df
  Author: Thomas Tanaka 
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
M templates/lxc-oracle.in
M templates/lxc-sparclinux.in

  Log Message:
  ---
  Improve on the case where default networking config is incomplete

Signed-off-by: Thomas Tanaka 


  Commit: 561067aa229fe6b87c644b08d787b2d76506e76a
  https://github.com/lxc/lxc/commit/561067aa229fe6b87c644b08d787b2d76506e76a
  Author: Christian Brauner 
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
M templates/lxc-oracle.in
M templates/lxc-sparclinux.in

  Log Message:
  ---
  Merge pull request #998 from thtanaka/network-config

Improve on the case where default networking config is incomplete


Compare: https://github.com/lxc/lxc/compare/5bb64b32b8ac...561067aa229f___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [lxc/master] Improve on the case where default networking config is incomplete

2016-05-02 Thread thtanaka on Github

The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/998

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: Thomas Tanaka 
From bb56ec0aeb932bd968984c18556abceb092776a7 Mon Sep 17 00:00:00 2001
From: Thomas Tanaka 
Date: Mon, 2 May 2016 11:30:30 -0700
Subject: [PATCH] Improve on the case where default networking config is
 incomplete

Signed-off-by: Thomas Tanaka 
---
 templates/lxc-oracle.in | 42 +-
 templates/lxc-sparclinux.in | 37 +
 2 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
index d5a1514..00af55d 100644
--- a/templates/lxc-oracle.in
+++ b/templates/lxc-oracle.in
@@ -40,10 +40,6 @@ done
 # Make sure the usual locations are in PATH
 export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
 
-# use virbr0 that is setup by default by libvirtd
-lxc_network_type=veth
-lxc_network_link=virbr0
-
 die()
 {
 echo "failed: $1"
@@ -484,11 +480,6 @@ container_config_create()
 echo "lxc.include = @LXCTEMPLATECONFIG@/oracle.common.conf" >> 
$cfg_dir/config
 fi
 
-# generate a hwaddr for the container with a high mac address
-# see 
http://sourceforge.net/tracker/?func=detail=3411497_id=163076=826303
-local hwaddr="fe:`dd if=/dev/urandom bs=8 count=1 2>/dev/null |od -t x8 | \
-  head -n 1 |awk '{print $2}' | cut -c1-10 |\
-  sed 's/\(..\)/\1:/g; s/.$//'`"
 cat <> $cfg_dir/config || die "unable to create $cfg_dir/config"
 # Container configuration for Oracle Linux 
$container_release_major.$container_release_minor
 lxc.arch = $arch
@@ -506,20 +497,37 @@ EOF
 fi
 
 echo "# Networking" >>$cfg_dir/config
-# see if the network settings were already specified
+# see if the default network settings were already specified
 lxc_network_type=`grep '^lxc.network.type' $cfg_dir/config | awk -F'[= 
\t]+' '{ print $2 }'`
-if [ -z "$lxc_network_type" -a \
-\( $host_distribution = "OracleServer" -o  \
-   $host_distribution = "Fedora" \) ]; then
-echo "lxc.network.type = veth" >>$cfg_dir/config
-echo "lxc.network.flags = up" >>$cfg_dir/config
-echo "lxc.network.link = virbr0" >>$cfg_dir/config
+if [ -z "$lxc_network_type" ]; then
+echo "lxc.network.type = veth" >>$cfg_dir/config
+lxc_network_type=veth
+fi
+
+lxc_network_link=`grep '^lxc.network.link' $cfg_dir/config | awk -F'[= 
\t]+' '{ print $2 }'`
+if [ -z "$lxc_network_link" ]; then
+echo "lxc.network.link = lxcbr0" >>$cfg_dir/config
+lxc_network_link=lxcbr0
+fi
+
+lxc_network_hwaddr=`grep '^lxc.network.hwaddr' $cfg_dir/config | awk -F'[= 
\t]+' '{ print $2 }'`
+if [ -z "$lxc_network_hwaddr" ]; then
+   # generate a hwaddr for the container
+# see 
http://sourceforge.net/tracker/?func=detail=3411497_id=163076=826303
+local hwaddr="00:16:3e:`dd if=/dev/urandom bs=8 count=1 2>/dev/null 
|od -t x8 | \
+head -n1 | awk '{print $2}' | cut -c1-6 | \
+sed 's/\(..\)/\1:/g; s/.$//'`"
+echo "lxc.network.hwaddr = $hwaddr" >>$cfg_dir/config
+fi
+
+lxc_network_flags=`grep '^lxc.network.flags' $cfg_dir/config | awk -F'[= 
\t]+' '{ print $2 }'`
+if [ -z "$lxc_network_flags" ]; then
+echo "lxc.network.flags = up" >>$cfg_dir/config
 fi
 
 cat <> $cfg_dir/config || die "unable to create $cfg_dir/config"
 lxc.network.name = eth0
 lxc.network.mtu = 1500
-lxc.network.hwaddr = $hwaddr
 EOF
 }
 
diff --git a/templates/lxc-sparclinux.in b/templates/lxc-sparclinux.in
index cfb893a..a3c9b57 100644
--- a/templates/lxc-sparclinux.in
+++ b/templates/lxc-sparclinux.in
@@ -44,10 +44,6 @@ done
 # Make sure the usual locations are in PATH
 export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
 
-# use virbr0 that is setup by default by libvirtd
-lxc_network_type=veth
-lxc_network_link=virbr0
-
 die()
 {
 echo "failed: $1"
@@ -336,20 +332,37 @@ EOF
 echo "lxc.cap.drop = setfcap setpcap" >>$cfg_dir/config
 
 echo "# Networking" >>$cfg_dir/config
-# see if the network settings were already specified
+# see if the default network settings were already specified
 lxc_network_type=`grep '^lxc.network.type' $cfg_dir/config | awk -F'[= 
\t]+' '{ print $2 }'`
-if [ -z "$lxc_network_type" -a \
-\( $host_distribution = "SPARCLinux" -o\
-   $host_distribution = "Fedora" \) ]; then
-echo "lxc.network.type = veth" >>$cfg_dir/config
-echo "lxc.network.flags = up" >>$cfg_dir/config
-

[lxc-devel] [nova-lxd/master] Fix driver loading in newton

2016-05-02 Thread zulcss on Github

The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/nova-lxd/pull/125

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) ===
Recent nova commit 8eb03de1eb83a6cd2d4d41804e1b8253f94e5400 removed the
mechanism by which nova-lxd was loading its ComputeDriver from out
of tree.

With Change-Id: I78c0ca85cb6ee2e370214a89a203f6f099748930 we can now add
to the nova.virt namespace from the nova-lxd package.

This change set restores the ability to load the driver by creating a
thin shim into nova.virt.lxd.driver, passing through all public
symbols from nova_lxd.virt.lxd.driver.

Signed-off-by: Chuck Short 
From a69911cf1c9369e358a4a4a663cdc3e25092a96f Mon Sep 17 00:00:00 2001
From: Chuck Short 
Date: Mon, 2 May 2016 12:28:37 -0400
Subject: [PATCH] Fix driver loading in newton

Recent nova commit 8eb03de1eb83a6cd2d4d41804e1b8253f94e5400 removed the
mechanism by which nova-powervm was loading its ComputeDriver from out
of tree.

With Change-Id: I78c0ca85cb6ee2e370214a89a203f6f099748930 we can now add
to the nova.virt namespace from the nova-lxd package.

This change set restores the ability to load the driver by creating a
thin shim into nova.virt.lxd.driver, passing through all public
symbols from nova_lxd.virt.lxd.driver.

Signed-off-by: Chuck Short 
---
 devstack/plugin.sh|  2 +-
 nova/__init__.py  | 16 
 nova/virt/__init__.py | 18 ++
 nova/virt/lxd/__init__.py |  0
 nova/virt/lxd/driver.py   | 17 +
 setup.cfg |  3 +--
 6 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 nova/__init__.py
 create mode 100644 nova/virt/__init__.py
 create mode 100644 nova/virt/lxd/__init__.py
 create mode 100644 nova/virt/lxd/driver.py

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index bab1818..1a8cddc 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -31,7 +31,7 @@ function install_nova-lxd() {
 
 function configure_nova-lxd() {
 # Configure the service.
-iniset $NOVA_CONF DEFAULT compute_driver nova_lxd.nova.virt.lxd.LXDDriver
+iniset $NOVA_CONF DEFAULT compute_driver lxd.driver.LXDDriver
 }
 
 function init_nova-lxd() {
diff --git a/nova/__init__.py b/nova/__init__.py
new file mode 100644
index 000..3afd61b
--- /dev/null
+++ b/nova/__init__.py
@@ -0,0 +1,16 @@
+# Copyright 2016 Canonical Ltd
+#
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/nova/virt/__init__.py b/nova/virt/__init__.py
new file mode 100644
index 000..e7936dd
--- /dev/null
+++ b/nova/virt/__init__.py
@@ -0,0 +1,18 @@
+# Copyright 2016 Canonical Ltd.
+#
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#License for the specific language governing permissions and limitations
+#under the License.
+
+# Allow composition of nova.virt namespace from disparate packages.
+__import__('pkg_resources').declare_namespace(__name__)
diff --git a/nova/virt/lxd/__init__.py b/nova/virt/lxd/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/nova/virt/lxd/driver.py b/nova/virt/lxd/driver.py
new file mode 100644
index 000..922937f
--- /dev/null
+++ b/nova/virt/lxd/driver.py
@@ -0,0 +1,17 @@
+# Copyright 2016 Canonical Ltd
+# All Rights Reserved.
+#
+#Licensed under the Apache License, Version 2.0 (the "License"); you may
+#not use this file except in compliance with the License. You may obtain
+#a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#Unless required by applicable law or agreed to in writing, software
+#distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#WARRANTIES OR CONDITIONS OF ANY KIND, either

[lxc-devel] [lxc/lxc] f7fe38: doc: Add logging option to Korean lxc-attach(1)

2016-05-02 Thread GitHub

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: f7fe38741d107ee9aee48b6861a9b64acf389984
  https://github.com/lxc/lxc/commit/f7fe38741d107ee9aee48b6861a9b64acf389984
  Author: Sungbae Yoo 
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
M doc/ko/lxc-attach.sgml.in

  Log Message:
  ---
  doc: Add logging option to Korean lxc-attach(1)

Update for commit f43d63b

Signed-off-by: Sungbae Yoo 


  Commit: 5bb64b32b8ac947cd5b43a98aa366aafdd34524f
  https://github.com/lxc/lxc/commit/5bb64b32b8ac947cd5b43a98aa366aafdd34524f
  Author: Christian Brauner 
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
M doc/ko/lxc-attach.sgml.in

  Log Message:
  ---
  Merge pull request #997 from ysbnim/master

Update Korean manuals


Compare: https://github.com/lxc/lxc/compare/25e032fb43a8...5bb64b32b8ac___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [lxc/master] Update Korean manuals

2016-05-02 Thread ysbnim on Github

The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/997

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) ===
doc: Add logging option to Korean lxc-attach(1)
From f7fe38741d107ee9aee48b6861a9b64acf389984 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo 
Date: Mon, 2 May 2016 18:25:29 +0900
Subject: [PATCH] doc: Add logging option to Korean lxc-attach(1)

Update for commit f43d63b

Signed-off-by: Sungbae Yoo 
---
 doc/ko/lxc-attach.sgml.in | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/doc/ko/lxc-attach.sgml.in b/doc/ko/lxc-attach.sgml.in
index 4f0a22c..3a6e9b1 100644
--- a/doc/ko/lxc-attach.sgml.in
+++ b/doc/ko/lxc-attach.sgml.in
@@ -63,6 +63,7 @@ by Sungbae Yoo 
   --keep-env
   --clear-env
   -- command
+  -L file
 
   
 
@@ -300,6 +301,28 @@ by Sungbae Yoo 

   
 
+  
+
+  -L, --pty-log file
+
+
+  
+
+lxc-attach의 출력을 기록할 파일을 지정한다.
+  
+  
+
+중요: 표준 입출력 파일 디스크립터가 pty를 참조하지 않으면, 기록되지 않는다.
+  
+
+  
+
 
 
   
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [linuxcontainers.org/master] Update Korean LXC introduction page

2016-05-02 Thread ysbnim on Github

The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/linuxcontainers.org/pull/181

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) ===

From 23729f80539b46abf77d1e0a3adfa949f38f5f70 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo 
Date: Mon, 2 May 2016 18:17:13 +0900
Subject: [PATCH] Update Korean LXC introduction page

Update for commit 7416137

Signed-off-by: Sungbae Yoo 
---
 content/lxc/introduction.ko.md | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/content/lxc/introduction.ko.md b/content/lxc/introduction.ko.md
index 9b71efe..b33ed0e 100644
--- a/content/lxc/introduction.ko.md
+++ b/content/lxc/introduction.ko.md
@@ -20,8 +20,8 @@ LXC는 현재 아래의 몇몇 요소들로 구성되어 있습니다.
 
  * liblxc 라이브러리
  * API의 프로그래밍 언어 바인딩 :
-* python3 (lxc 내, 1.0.x에서 장기 지원 (LTS, long term support))
-* lua (lxc 내, 1.0.x에서 장기 지원)
+* python3 (lxc 내, 1.0.x와 2.0.x에서 장기 지원 (LTS, long term support))
+* lua (lxc 내, 1.0.x와 2.0.x에서 장기 지원)
 * [Go](https://github.com/lxc/go-lxc)
 * [ruby](https://github.com/lxc/ruby-lxc)
 * [python2](https://github.com/lxc/python2-lxc)
@@ -46,6 +46,7 @@ LXC의 안정화 버전 공개는 각 리눅스 배포판 안정화 버전의 
 우분투 LTS 버전의 LXC에 대한 상업적인 지원은 [Canonical Ltd](http://www.canonical.com)에서 얻을 수 
있습니다.
 
 ## 부가 지원
-지금 현재, LXC 1.0이 2014년 2월부터 시작하여 2019년 4월까지 (5년이 약간 넘는 기간) 지원을 받는 유일한 버전입니다.
+LXC 1.0와 2.0은 장기 지원되는 버전입니다.
+LXC 1.0은 2019년 6월 1일까지, LXC 2.0은 2021년 6월 1일까지입니다.
 
-이는 [Canonical Ltd](http://www.canonical.com)와 우분투가 LXC 1.0을 우분투 14.04 LTS (장기 
지원)에 포함시켰고 안정적인 1.0 브랜치를 유지하기 위해 LXC upstream과 긴밀하게 협력하는 덕분입니다.
+[Canonical Ltd](http://www.canonical.com)와 LXC의 장기 지원 버전을 자신의 장기지원 버전에 포함시킨 
우분투에게 감사드리며, 안정적인 브랜치를 유지하기 위해 LXC upstream과 긴밀하게 협력하고 있습니다.
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [lxc/lxc] bc3b32: Improve on the case where default networking confi...

[lxc-devel] [lxc/master] Improve on the case where default networking config is incomplete

[lxc-devel] [nova-lxd/master] Fix driver loading in newton

[lxc-devel] [lxc/lxc] f7fe38: doc: Add logging option to Korean lxc-attach(1)

[lxc-devel] [lxc/master] Update Korean manuals

[lxc-devel] [linuxcontainers.org/master] Update Korean LXC introduction page

6 matches

Site Navigation

Mail list logo

Footer information