[incubator-openwhisk] branch master updated: Do not link the `/run/runc` volume unless invoker.useRunc is set (#4149)

[dg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new f2efca7  Do not link the `/run/runc` volume unless invoker.useRunc is set (#4149)
f2efca7 is described below

commit f2efca7e926b79c1780c59b67d353ed5c98ecb46
Author: Rob Allen <ro...@akrabat.com>
AuthorDate: Fri Dec 7 19:28:48 2018 +0000

    Do not link the `/run/runc` volume unless invoker.useRunc is set (#4149)
    
    * Do not link the `/run/runc` volume unless invoker.useRunc is set
---
 ansible/roles/invoker/tasks/deploy.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
index 32acfc7..9e37b03 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -262,12 +262,17 @@
 
 - name: set invoker volumes
   set_fact:
-    volumes: "/sys/fs/cgroup:/sys/fs/cgroup,/run/runc:/run/runc,\
+    volumes: "/sys/fs/cgroup:/sys/fs/cgroup,\
       {{ whisk_logs_dir }}/{{ invoker_name }}:/logs,\
       {{ invoker.confdir }}/{{ invoker_name }}:/conf,\
       {{ dockerInfo['DockerRootDir'] }}/containers/:/containers,\
       {{ docker_sock | default('/var/run/docker.sock') }}:/var/run/docker.sock"
 
+- name: set invoker runc volume
+  set_fact:
+    volumes: "{{ volumes }},/run/runc:/run/runc"
+  when: invoker.useRunc == true
+
 - name: define options when deploying invoker on Ubuntu
   set_fact:
     volumes: "{{ volumes|default('') }},/usr/lib/x86_64-linux-gnu/libapparmor.so.1:/usr/lib/x86_64-linux-gnu/libapparmor.so.1"