From dac4705ebe6009123a225fc9f29397d4f0bf9940 Mon Sep 17 00:00:00 2001
From: ERIK <bo.jiang@daocloud.io>
Date: Fri, 17 May 2024 19:24:38 +0800
Subject: [PATCH] bump docker version for openeuler linux (#11206)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
---
roles/bootstrap-os/tasks/openEuler.yml | 1 +
roles/container-engine/docker/tasks/main.yml | 7 -------
roles/container-engine/docker/vars/openeuler.yml | 1 +
3 files changed, 2 insertions(+), 7 deletions(-)
create mode 120000 roles/bootstrap-os/tasks/openEuler.yml
create mode 120000 roles/container-engine/docker/vars/openeuler.yml
diff --git a/roles/bootstrap-os/tasks/openEuler.yml b/roles/bootstrap-os/tasks/openEuler.yml
new file mode 120000
index 000000000..fa2c37f2a
--- /dev/null
+++ b/roles/bootstrap-os/tasks/openEuler.yml
@@ -0,0 +1 @@
+centos.yml
\ No newline at end of file
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index 376ee0504..1ccee8c4c 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -11,13 +11,6 @@
set_fact:
is_ostree: "{{ ostree.stat.exists }}"
-- name: Set docker_version for openEuler
- set_fact:
- docker_version: '19.03'
- when: ansible_distribution == "openEuler"
- tags:
- - facts
-
- name: Gather os specific variables
include_vars: "{{ item }}"
with_first_found:
diff --git a/roles/container-engine/docker/vars/openeuler.yml b/roles/container-engine/docker/vars/openeuler.yml
new file mode 120000
index 000000000..1010ef7ef
--- /dev/null
+++ b/roles/container-engine/docker/vars/openeuler.yml
@@ -0,0 +1 @@
+kylin.yml
\ No newline at end of file
--
GitLab