summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2018-02-07 15:50:22 -0500
committerKenny Woodson <kwoodson@redhat.com>2018-02-07 20:44:58 -0500
commitecfffdb279d2b4ef45d8685f599b904bd48cd71d (patch)
tree087bcc98920680fd9ef85344cfe1ea2a4adc3a65
parente4cbec17b2a2913c38c67f913c739b5f0772d0dd (diff)
downloadopenshift-ecfffdb279d2b4ef45d8685f599b904bd48cd71d.tar.gz
openshift-ecfffdb279d2b4ef45d8685f599b904bd48cd71d.tar.bz2
openshift-ecfffdb279d2b4ef45d8685f599b904bd48cd71d.tar.xz
openshift-ecfffdb279d2b4ef45d8685f599b904bd48cd71d.zip
Adding ability to provide additional mounts to crio system container.
-rw-r--r--roles/container_runtime/defaults/main.yml10
-rw-r--r--roles/container_runtime/tasks/systemcontainer_crio.yml2
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml
index 7397e2bec..22e16d29d 100644
--- a/roles/container_runtime/defaults/main.yml
+++ b/roles/container_runtime/defaults/main.yml
@@ -94,6 +94,16 @@ l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure
l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"
+# this is a list of dictionaries of mounts
+# container_runtime_crio_additional_mounts:
+# - destination: /test
+# source: /var/test
+# options:
+# - rw
+# - mode=755
+container_runtime_crio_additional_mounts: []
+
+l_crio_additional_mounts: "{{ ',' + (container_runtime_crio_additional_mounts | lib_utils_oo_l_of_d_to_csv) if container_runtime_crio_additional_mounts != [] else '' }}"
openshift_crio_image_tag_default: "latest"
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index d588f2618..f053bdea5 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/roles/container_runtime/tasks/systemcontainer_crio.yml
@@ -53,6 +53,8 @@
name: "cri-o"
image: "{{ l_crio_image }}"
state: latest
+ values:
+ - "ADDTL_MOUNTS={{ l_crio_additional_mounts }}"
- name: Remove CRI-O default configuration files
file: