Parcourir la source

Merge pull request #8471 from vrutkovs/etcd-runtime-improvements

etcd runtime: system container can start etcd service too
OpenShift Merge Robot il y a 6 ans
Parent
commit
a2c48f02d5
1 fichiers modifiés avec 6 ajouts et 1 suppressions
  1. 6 1
      roles/etcd/tasks/runtime.yml

+ 6 - 1
roles/etcd/tasks/runtime.yml

@@ -8,7 +8,12 @@
 - name: Set runtime to host
   set_fact:
     r_etcd_common_etcd_runtime: host
-  when: etcd_service.status.ActiveState == 'active'
+  when: etcd_service.status.ActiveState == 'active' and not l_is_etcd_system_container
+
+- name: Set runtime to runc
+  set_fact:
+    r_etcd_common_etcd_runtime: runc
+  when: etcd_service.status.ActiveState == 'active' and l_is_etcd_system_container
 
 - name: Check if etcd service exists
   systemd: