Merge pull request #154 from zexi/automated-cherry-pick-of-#153-upstr…

…eam-release-3.6 Automated cherry pick of #153: fix: turn off swap with name none
yunionio · Jun 30, 2021 · b6d17d7 · b6d17d7
2 parents 987c0f1 + 67fff52
commit b6d17d7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/onecloud/roles/common/tasks/main.yml b/onecloud/roles/common/tasks/main.yml
@@ -158,9 +158,13 @@
 #  https://github.com/kubernetes-retired/contrib/blob/master/ansible/roles/node/tasks/swapoff.yml
 - name: Turn off swap mount
   mount:
-    name: swap
+    name: "{{ item }}"
     fstype: swap
     state: absent
+  with_items:
+  - swap
+  - none
+
 - name: Turn off swap now
   command: swapoff -a
   when: ansible_swaptotal_mb > 0