Make growpart only run on Azure

zchkun · Dec 12, 2016 · 5176e5c · 5176e5c
1 parent 42ea4d2
commit 5176e5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...es/preinstall/tasks/growpart-centos-7.yml → ...install/tasks/growpart-azure-centos-7.yml b/...es/preinstall/tasks/growpart-centos-7.yml → ...install/tasks/growpart-azure-centos-7.yml
@@ -1,5 +1,7 @@
 ---
 
+# Running growpart seems to be only required on Azure, as other Cloud Providers do this at boot time
+
 - name: install growpart
   package: name=cloud-utils-growpart state=latest
 

diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
@@ -181,8 +181,14 @@
 - include: resolvconf.yml
   tags: [bootstrap-os, resolvconf]
 
-- include: growpart-centos-7.yml
-  when: ansible_distribution in ["CentOS","RedHat"] and
+- name: Check if we are running inside a Azure VM
+  stat: path=/var/lib/waagent/
+  register: azure_check
+  tags: bootstrap-os
+
+- include: growpart-azure-centos-7.yml
+  when: azure_check.stat.exists and
+        ansible_distribution in ["CentOS","RedHat"] and
         ansible_distribution_major_version >= 7
   tags: bootstrap-os