From 71b0067aa6dcfeef0e3505ce63075b24d3d2146a Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 30 Mar 2016 17:07:10 +0200 Subject: [PATCH 1/2] do not set a default config for lxc containers otherwise deploying user-containers fail as these require information from ~/.config/lxc/default.conf that the LXC tools will load if no --config was supplied Signed-off-by: Evgeni Golov --- cloud/lxc/lxc_container.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cloud/lxc/lxc_container.py b/cloud/lxc/lxc_container.py index ab207012329..5ceac066857 100644 --- a/cloud/lxc/lxc_container.py +++ b/cloud/lxc/lxc_container.py @@ -57,7 +57,6 @@ options: description: - Path to the LXC configuration file. required: false - default: /etc/lxc/default.conf lv_name: description: - Name of the logical volume, defaults to the container name. @@ -1687,7 +1686,6 @@ def main(): ), config=dict( type='str', - default='/etc/lxc/default.conf' ), vg_name=dict( type='str', From 185bcbd8f78baac2a7b2db57fd62179dda5f19b8 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 1 Apr 2016 11:04:35 +0200 Subject: [PATCH 2/2] explicitly set "default: null" in the docs --- cloud/lxc/lxc_container.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud/lxc/lxc_container.py b/cloud/lxc/lxc_container.py index 5ceac066857..57cda6157ce 100644 --- a/cloud/lxc/lxc_container.py +++ b/cloud/lxc/lxc_container.py @@ -57,6 +57,7 @@ options: description: - Path to the LXC configuration file. required: false + default: null lv_name: description: - Name of the logical volume, defaults to the container name.