From 4ece7ca92210a18879d6ceff2c54ae5563e1c7fc Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Wed, 24 May 2017 09:53:07 -0400 Subject: Remove system-package=no from container-engine install --- roles/docker/tasks/systemcontainer_docker.yml | 2 -- 1 file changed, 2 deletions(-) (limited to 'roles/docker') diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 3af3e00b2..8c899bf89 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -124,8 +124,6 @@ name: "{{ openshift.docker.service_name }}" image: "{{ l_docker_image }}" state: latest - values: - - "system-package=no" - name: Configure Container Engine Service File template: -- cgit v1.2.3 From 1898489b4c2bb63ee7a4e284a4f7c1b5710e8d5b Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Thu, 25 May 2017 13:50:15 -0400 Subject: Remove typos that got reintroduced --- roles/docker/tasks/systemcontainer_docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/docker') diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 8c899bf89..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,7 +119,7 @@ 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 }}" -- cgit v1.2.3