diff options
author | Steve Milner <smilner@redhat.com> | 2017-04-24 16:28:37 -0400 |
---|---|---|
committer | Steve Milner <smilner@redhat.com> | 2017-05-03 09:22:17 -0400 |
commit | 44115530148069e200e3a5d92b00e981aaa6e824 (patch) | |
tree | d2b30e5d22f58f1e9802b2f8ad7ae2a253b608d4 /roles/openshift_node_upgrade | |
parent | ba5c6594ade6679d055aaecc7c38836444f0f791 (diff) | |
download | openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.gz openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.bz2 openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.xz openshift-44115530148069e200e3a5d92b00e981aaa6e824.zip |
System container docker
This change allows for the use of either the traditional package install
of docker OR a system container install of docker.
Two new inventory options, openshift_docker_use_system_container and
openshift_docker_systemcontainer_image_registry_override, have been
added which are be used to install with a system container. By default
this option is commented out.
One new fact has been added:
- docker.service_name: docker by default, container-engine-docker
for system container
Diffstat (limited to 'roles/openshift_node_upgrade')
-rw-r--r-- | roles/openshift_node_upgrade/tasks/restart.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_node_upgrade/tasks/restart.yml b/roles/openshift_node_upgrade/tasks/restart.yml index a9fab74e1..e576228ba 100644 --- a/roles/openshift_node_upgrade/tasks/restart.yml +++ b/roles/openshift_node_upgrade/tasks/restart.yml @@ -6,7 +6,9 @@ # - openshift.master.api_port - name: Restart docker - service: name=docker state=restarted + service: + name: "{{ openshift.docker.service_name }}" + state: restarted - name: Update docker facts openshift_facts: |