diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-08 06:30:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 06:30:29 -0800 |
| commit | 58b32c510225d6f9d8b9c716dac5eb1c857f328c (patch) | |
| tree | 189472b197ff5f2c007fad8e62fef7701b5300c3 /playbooks | |
| parent | 38f47effc1783b92328bcfc739b782a616786922 (diff) | |
| parent | 51301a7b548f26e224ca3d59da8a8b5e0a2197b0 (diff) | |
| download | openshift-58b32c510225d6f9d8b9c716dac5eb1c857f328c.tar.gz openshift-58b32c510225d6f9d8b9c716dac5eb1c857f328c.tar.bz2 openshift-58b32c510225d6f9d8b9c716dac5eb1c857f328c.tar.xz openshift-58b32c510225d6f9d8b9c716dac5eb1c857f328c.zip | |
Merge pull request #7043 from vrutkovs/prerequisites-enable-docker-excluder
Automatic merge from submit-queue.
Setup docker excluder if requested before container_runtime is installed
That would prevent possible container runtime upgrades during cluster
config
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1540800
Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/container-runtime/private/config.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/container-runtime/private/config.yml b/playbooks/container-runtime/private/config.yml index 5396df20a..d5312de15 100644 --- a/playbooks/container-runtime/private/config.yml +++ b/playbooks/container-runtime/private/config.yml @@ -12,6 +12,12 @@ - role: container_runtime tasks: - import_role: + name: openshift_excluder + tasks_from: enable.yml + vars: + r_openshift_excluder_action: enable + r_openshift_excluder_enable_openshift_excluder: false + - import_role: name: container_runtime tasks_from: package_docker.yml when: |