diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-06 12:47:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 12:47:20 -0400 |
| commit | 4effa70d5a7f9612de1cbedf18a5d682a9849dee (patch) | |
| tree | 31a9e4976e2b21b8726af93eae4ebcb3e6452f9c | |
| parent | 6fc8a058fb5f359f6c980dbdc9543b7a03a47ef9 (diff) | |
| parent | c0a018ed3a9f9dacc9a9e29fdd18a66d6fab6e85 (diff) | |
| download | openshift-4effa70d5a7f9612de1cbedf18a5d682a9849dee.tar.gz openshift-4effa70d5a7f9612de1cbedf18a5d682a9849dee.tar.bz2 openshift-4effa70d5a7f9612de1cbedf18a5d682a9849dee.tar.xz openshift-4effa70d5a7f9612de1cbedf18a5d682a9849dee.zip | |
Merge pull request #5202 from giuseppe/crio-additional-registries
Merged by openshift-bot
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 9 | ||||
| -rw-r--r-- | roles/docker/templates/crio.conf.j2 | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 787f51f94..451b8498f 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -3,6 +3,15 @@ - set_fact: l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(openshift.docker.insecure_registries)) }}" when: openshift.docker.insecure_registries +- set_fact: + l_crio_registries: "{{ openshift.docker.additional_registries + ['docker.io'] }}" + when: openshift.docker.additional_registries +- set_fact: + l_crio_registries: "{{ ['docker.io'] }}" + when: not openshift.docker.additional_registries +- set_fact: + l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}" + when: openshift.docker.additional_registries - name: Ensure container-selinux is installed package: diff --git a/roles/docker/templates/crio.conf.j2 b/roles/docker/templates/crio.conf.j2 index 5b31932b1..b4ee84fd0 100644 --- a/roles/docker/templates/crio.conf.j2 +++ b/roles/docker/templates/crio.conf.j2 @@ -120,6 +120,11 @@ insecure_registries = [ {{ l_insecure_crio_registries|default("") }} ] +# registries is used to specify a comma separated list of registries to be used +# when pulling an unqualified image (e.g. fedora:rawhide). +registries = [ +{{ l_additional_crio_registries|default("") }} +] # The "crio.network" table contains settings pertaining to the # management of CNI plugins. [crio.network] |