From caf561570438c8b83e09b0b861c36b5e0570fd58 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 7 Feb 2018 17:37:29 +0100 Subject: [PATCH 1/3] syscontainers, centos: add ADDTL_MOUNTS This allows to accept additional mounts during creation. Signed-off-by: Giuseppe Scrivano --- contrib/system_containers/centos/config.json.template | 1 + contrib/system_containers/centos/manifest.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/system_containers/centos/config.json.template b/contrib/system_containers/centos/config.json.template index 785383d4..1b2d47ec 100644 --- a/contrib/system_containers/centos/config.json.template +++ b/contrib/system_containers/centos/config.json.template @@ -423,5 +423,6 @@ "source": "/proc", "type": "proc" } + $ADDTL_MOUNTS ] } diff --git a/contrib/system_containers/centos/manifest.json b/contrib/system_containers/centos/manifest.json index 38f4dc87..bbebea63 100644 --- a/contrib/system_containers/centos/manifest.json +++ b/contrib/system_containers/centos/manifest.json @@ -5,6 +5,7 @@ "OPT_CNI" : "/opt/cni", "VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage", "VAR_LIB_ORIGIN" : "/var/lib/origin", - "VAR_LIB_KUBE" : "/var/lib/kubelet" + "VAR_LIB_KUBE" : "/var/lib/kubelet", + "ADDTL_MOUNTS" : "" } } From 332aeee1b9557be51f5ea38d9da525a70435c70e Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 7 Feb 2018 17:37:53 +0100 Subject: [PATCH 2/3] syscontainers, fedora: add ADDTL_MOUNTS This allows to accept additional mounts during creation. Signed-off-by: Giuseppe Scrivano --- contrib/system_containers/fedora/config.json.template | 1 + contrib/system_containers/fedora/manifest.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/system_containers/fedora/config.json.template b/contrib/system_containers/fedora/config.json.template index 0642fbc1..a606ac56 100644 --- a/contrib/system_containers/fedora/config.json.template +++ b/contrib/system_containers/fedora/config.json.template @@ -428,5 +428,6 @@ "source": "/proc", "type": "proc" } + $ADDTL_MOUNTS ] } diff --git a/contrib/system_containers/fedora/manifest.json b/contrib/system_containers/fedora/manifest.json index 38f4dc87..bbebea63 100644 --- a/contrib/system_containers/fedora/manifest.json +++ b/contrib/system_containers/fedora/manifest.json @@ -5,6 +5,7 @@ "OPT_CNI" : "/opt/cni", "VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage", "VAR_LIB_ORIGIN" : "/var/lib/origin", - "VAR_LIB_KUBE" : "/var/lib/kubelet" + "VAR_LIB_KUBE" : "/var/lib/kubelet", + "ADDTL_MOUNTS" : "" } } From 64e25b8c1b3d7d7b72597e642169db069e37d5cf Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 7 Feb 2018 17:38:09 +0100 Subject: [PATCH 3/3] syscontainers, rhel: add ADDTL_MOUNTS This allows to accept additional mounts during creation. Signed-off-by: Giuseppe Scrivano --- contrib/system_containers/rhel/config.json.template | 1 + contrib/system_containers/rhel/manifest.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/system_containers/rhel/config.json.template b/contrib/system_containers/rhel/config.json.template index a5eb001e..a8295820 100644 --- a/contrib/system_containers/rhel/config.json.template +++ b/contrib/system_containers/rhel/config.json.template @@ -418,5 +418,6 @@ "source": "/proc", "type": "proc" } + $ADDTL_MOUNTS ] } diff --git a/contrib/system_containers/rhel/manifest.json b/contrib/system_containers/rhel/manifest.json index 727abf9e..4eb73ed6 100644 --- a/contrib/system_containers/rhel/manifest.json +++ b/contrib/system_containers/rhel/manifest.json @@ -5,6 +5,7 @@ "OPT_CNI": "/opt/cni", "VAR_LIB_CONTAINERS_STORAGE": "/var/lib/containers/storage", "VAR_LIB_ORIGIN": "/var/lib/origin", - "VAR_LIB_KUBE": "/var/lib/kubelet" + "VAR_LIB_KUBE": "/var/lib/kubelet", + "ADDTL_MOUNTS" : "" } }