diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-30 21:35:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 21:35:25 -0500 |
| commit | ce90c55beba2e0b0e72945f99cca0ed60e1fe0a3 (patch) | |
| tree | 6fce26b97b16069d0dd7359b42427a1b6d1bc1ff /roles/docker | |
| parent | 14d4e10132307bb60daaee71cfec719486f2fdb5 (diff) | |
| parent | 1898489b4c2bb63ee7a4e284a4f7c1b5710e8d5b (diff) | |
| download | openshift-ce90c55beba2e0b0e72945f99cca0ed60e1fe0a3.tar.gz openshift-ce90c55beba2e0b0e72945f99cca0ed60e1fe0a3.tar.bz2 openshift-ce90c55beba2e0b0e72945f99cca0ed60e1fe0a3.tar.xz openshift-ce90c55beba2e0b0e72945f99cca0ed60e1fe0a3.zip | |
Merge pull request #4272 from ashcrow/system-package-no-hardcode
Merged by openshift-bot
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 3af3e00b2..f0f5a40dd 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -102,7 +102,7 @@ l_docker_image: "{{ l_docker_image_prepend }}/{{ openshift.docker.service_name }}:latest" # NOTE: no_proxy added as a workaround until https://github.com/projectatomic/atomic/pull/999 is released -- name: Pre-pull Container Enginer System Container image +- name: Pre-pull Container Engine System Container image command: "atomic pull --storage ostree {{ l_docker_image }}" changed_when: false environment: @@ -119,13 +119,11 @@ path: "{{ docker_conf_dir }}" state: directory -- name: Install Container Enginer System Container +- name: Install Container Engine System Container oc_atomic_container: name: "{{ openshift.docker.service_name }}" image: "{{ l_docker_image }}" state: latest - values: - - "system-package=no" - name: Configure Container Engine Service File template: |