diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-11 16:17:11 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-11 16:17:11 -0400 |
| commit | 71f17dedb103c546051573206a5603664286fa84 (patch) | |
| tree | 55d736f7ad054bf91a8c96fe5fdfbd417fb77cc8 /roles | |
| parent | 1bc6b51585c23670fdc08a1df6a89d35cd0b8149 (diff) | |
| parent | d2118c78fcb0a016fb693b68eb3ad452d58c2fe9 (diff) | |
| download | openshift-71f17dedb103c546051573206a5603664286fa84.tar.gz openshift-71f17dedb103c546051573206a5603664286fa84.tar.bz2 openshift-71f17dedb103c546051573206a5603664286fa84.tar.xz openshift-71f17dedb103c546051573206a5603664286fa84.zip | |
Merge pull request #1740 from dgoodwin/docker-sysconfig
Fix a docker-storage sysconfig bug.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/docker/tasks/main.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 2d207a1a9..1d8493938 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -16,14 +16,13 @@ action: "{{ ansible_pkg_mgr }} name=docker{{ '-' + docker_version if docker_version != '' else '' }} state=present" when: not openshift.common.is_atomic | bool and not docker_downgrade_result | changed -- stat: path=/etc/sysconfig/docker - register: docker_check - when: docker_downgrade_result | changed +- stat: path=/etc/sysconfig/docker-storage + register: docker_storage_check - name: Remove deferred deletion for downgrades from 1.9 command: > sed -i 's/--storage-opt dm.use_deferred_deletion=true//' /etc/sysconfig/docker-storage - when: docker_downgrade_result | changed and docker_check.stat.exists | bool and docker_version_result.stdout | default('0.0', True) | version_compare('1.9', '>=') and docker_version | version_compare('1.9', '<') + when: docker_downgrade_result | changed and docker_storage_check.stat.exists | bool and docker_version_result.stdout | default('0.0', True) | version_compare('1.9', '>=') and docker_version | version_compare('1.9', '<') - name: enable and start the docker service service: |