diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2018-02-09 10:00:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 10:00:51 -0500 |
| commit | 7fb1a84518908e5ca3dcb54c620f589307dc3e97 (patch) | |
| tree | 437d87c84ce004573af3e7780abe3692742b016a /roles/container_runtime | |
| parent | 3ef7a209dde51c972d25c8ecfc019704ce056db7 (diff) | |
| parent | ecfffdb279d2b4ef45d8685f599b904bd48cd71d (diff) | |
| download | openshift-7fb1a84518908e5ca3dcb54c620f589307dc3e97.tar.gz openshift-7fb1a84518908e5ca3dcb54c620f589307dc3e97.tar.bz2 openshift-7fb1a84518908e5ca3dcb54c620f589307dc3e97.tar.xz openshift-7fb1a84518908e5ca3dcb54c620f589307dc3e97.zip | |
Merge pull request #7058 from kwoodson/crio_additional_mounts
Adding ability to provide additional mounts to crio system container.
Diffstat (limited to 'roles/container_runtime')
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 10 | ||||
| -rw-r--r-- | roles/container_runtime/tasks/systemcontainer_crio.yml | 2 |
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: |