libvirt: use command instead of which to test cloud-init

SUSE · May 24, 2022 · 51c834c · 51c834c
1 parent 6afa11f
commit 51c834c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/libvirt/modules/drbd_node/salt_provisioner.tf b/libvirt/modules/drbd_node/salt_provisioner.tf
@@ -11,7 +11,7 @@ resource "null_resource" "wait_after_cloud_init" {
 
   provisioner "remote-exec" {
     inline = [
-      "if which cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
+      "if command -v cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
     ]
   }
 

diff --git a/libvirt/modules/hana_node/salt_provisioner.tf b/libvirt/modules/hana_node/salt_provisioner.tf
@@ -11,7 +11,7 @@ resource "null_resource" "wait_after_cloud_init" {
 
   provisioner "remote-exec" {
     inline = [
-      "if which cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
+      "if command -v cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
     ]
   }
 

diff --git a/libvirt/modules/iscsi_server/salt_provisioner.tf b/libvirt/modules/iscsi_server/salt_provisioner.tf
@@ -7,7 +7,7 @@ resource "null_resource" "wait_after_cloud_init" {
 
   provisioner "remote-exec" {
     inline = [
-      "if which cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
+      "if command -v cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
     ]
   }
 

diff --git a/libvirt/modules/majority_maker_node/salt_provisioner.tf b/libvirt/modules/majority_maker_node/salt_provisioner.tf
@@ -11,7 +11,7 @@ resource "null_resource" "wait_after_cloud_init" {
 
   provisioner "remote-exec" {
     inline = [
-      "if which cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
+      "if command -v cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
     ]
   }
 

diff --git a/libvirt/modules/monitoring/salt_provisioner.tf b/libvirt/modules/monitoring/salt_provisioner.tf
@@ -7,7 +7,7 @@ resource "null_resource" "wait_after_cloud_init" {
 
   provisioner "remote-exec" {
     inline = [
-      "if which cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
+      "if command -v cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
     ]
   }
 

diff --git a/libvirt/modules/netweaver_node/salt_provisioner.tf b/libvirt/modules/netweaver_node/salt_provisioner.tf
@@ -11,7 +11,7 @@ resource "null_resource" "wait_after_cloud_init" {
 
   provisioner "remote-exec" {
     inline = [
-      "if which cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
+      "if command -v cloud-init; then cloud-init status --wait; else echo no cloud-init installed; fi"
     ]
   }