Clearer arguments for ansible-playbook command.

laurentedel · Nov 13, 2018 · 3020c52 · 3020c52
1 parent 7346416
commit 3020c52
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/apply_blueprint.sh b/apply_blueprint.sh
@@ -2,4 +2,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/set_cloud.sh
 
-ansible-playbook -i "inventory/${cloud_to_use}" -e "cloud_name=${cloud_to_use}" playbooks/apply_blueprint.yml "$@"
+ansible-playbook "playbooks/apply_blueprint.yml" \
+                 --inventory="inventory/${cloud_to_use}" \
+                 --extra-vars="cloud_name=${cloud_to_use}" \
+                 "$@"
diff --git a/configure_ambari.sh b/configure_ambari.sh
@@ -2,4 +2,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/set_cloud.sh
 
-ansible-playbook -i "inventory/${cloud_to_use}" -e "cloud_name=${cloud_to_use}" playbooks/configure_ambari.yml "$@"
+ansible-playbook "playbooks/configure_ambari.yml" \
+                 --inventory="inventory/${cloud_to_use}" \
+                 --extra-vars="cloud_name=${cloud_to_use}" \
+                 "$@"
diff --git a/install_ambari.sh b/install_ambari.sh
@@ -2,4 +2,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/set_cloud.sh
 
-ansible-playbook -i "inventory/${cloud_to_use}" -e "cloud_name=${cloud_to_use}" playbooks/install_ambari.yml "$@"
+ansible-playbook "playbooks/install_ambari.yml" \
+                 --inventory="inventory/${cloud_to_use}" \
+                 --extra-vars="cloud_name=${cloud_to_use}" \
+                 "$@"
diff --git a/install_cluster.sh b/install_cluster.sh
@@ -2,4 +2,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/set_cloud.sh
 
-ansible-playbook -i "inventory/${cloud_to_use}" -e "cloud_name=${cloud_to_use}" playbooks/install_cluster.yml "$@"
+ansible-playbook "playbooks/install_cluster.yml" \
+                 --inventory="inventory/${cloud_to_use}" \
+                 --extra-vars="cloud_name=${cloud_to_use}" \
+                 "$@"
diff --git a/post_install.sh b/post_install.sh
@@ -2,4 +2,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/set_cloud.sh
 
-ansible-playbook -i "inventory/${cloud_to_use}" -e "cloud_name=${cloud_to_use}" playbooks/post_install.yml "$@"
+ansible-playbook "playbooks/post_install.yml" \
+                 --inventory="inventory/${cloud_to_use}" \
+                 --extra-vars="cloud_name=${cloud_to_use}" \
+                 "$@"
diff --git a/prepare_nodes.sh b/prepare_nodes.sh
@@ -2,4 +2,7 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/set_cloud.sh
 
-ansible-playbook -i "inventory/${cloud_to_use}" -e "cloud_name=${cloud_to_use}" playbooks/prepare_nodes.yml "$@"
+ansible-playbook "playbooks/prepare_nodes.yml" \
+                 --inventory="inventory/${cloud_to_use}" \
+                 --extra-vars="cloud_name=${cloud_to_use}" \
+                 "$@"