added option to script subcommand for specifying a fully qualified domain name
This commit is contained in:
@@ -82,7 +82,7 @@ if [[ "$1" == "init" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while getopts "htm:s:n:v:u:" opt; do
|
while getopts "htd:m:s:n:v:u:" opt; do
|
||||||
case $opt in
|
case $opt in
|
||||||
h) Help "init";;
|
h) Help "init";;
|
||||||
s) SKANSIBLE_STAGE="$OPTARG";;
|
s) SKANSIBLE_STAGE="$OPTARG";;
|
||||||
@@ -91,6 +91,7 @@ if [[ "$1" == "init" ]]; then
|
|||||||
t) SKANSIBLE_UNITTEST=True;;
|
t) SKANSIBLE_UNITTEST=True;;
|
||||||
u) export ANSIBLE_REMOTE_USER="$OPTARG";;
|
u) export ANSIBLE_REMOTE_USER="$OPTARG";;
|
||||||
m) SKANSIBLE_MODE="$OPTARG";;
|
m) SKANSIBLE_MODE="$OPTARG";;
|
||||||
|
d) SKANSIBLE_FQDN="$OPTARG";;
|
||||||
*) echo "Err: Invalid option set"; exit 1;;
|
*) echo "Err: Invalid option set"; exit 1;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -99,23 +100,23 @@ if [[ "$1" == "init" ]]; then
|
|||||||
# SKANSIBLE_CONN_HOST=staging${SKANSIBLE_STAGE}.test
|
# SKANSIBLE_CONN_HOST=staging${SKANSIBLE_STAGE}.test
|
||||||
if [[ "$SKANSIBLE_STAGE" == 0 ]]; then
|
if [[ "$SKANSIBLE_STAGE" == 0 ]]; then
|
||||||
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
||||||
sudo ansible-playbook -CKk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
sudo ansible-playbook -CKk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
else
|
else
|
||||||
sudo ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
sudo ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
fi
|
fi
|
||||||
elif [[ "$SKANSIBLE_STAGE" == 1 ]]; then
|
elif [[ "$SKANSIBLE_STAGE" == 1 ]]; then
|
||||||
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
||||||
sudo ansible-playbook -CK -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
sudo ansible-playbook -CK -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
else
|
else
|
||||||
sudo ansible-playbook -K -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
sudo ansible-playbook -K -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [[ -z "$SKANSIBLE_CONN_HOST" ]]; then
|
if [[ -z "$SKANSIBLE_CONN_HOST" ]] && [[ -z "$SKANSIBLE_FQDN" ]]; then
|
||||||
echo "When not doing staging, chosen or preferred host must be made explicit"
|
echo "When not doing staging, chosen or preferred host must be made explicit as well as desired FQDN"
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
sudo ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=prod" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
sudo ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-root}" --extra-vars "mode=prod" --extra-vars "fqdn=${SKANSIBLE_FQDN}" "init@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -138,7 +139,7 @@ if [[ "$1" == "bootstrap" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while getopts "htm:s:n:v:u:" opt; do
|
while getopts "htd:m:s:n:v:u:" opt; do
|
||||||
case $opt in
|
case $opt in
|
||||||
h) Help "bootstrap";;
|
h) Help "bootstrap";;
|
||||||
s) SKANSIBLE_STAGE="$OPTARG";;
|
s) SKANSIBLE_STAGE="$OPTARG";;
|
||||||
@@ -147,6 +148,7 @@ if [[ "$1" == "bootstrap" ]]; then
|
|||||||
t) SKANSIBLE_UNITTEST=True;;
|
t) SKANSIBLE_UNITTEST=True;;
|
||||||
u) export ANSIBLE_REMOTE_USER="$OPTARG";;
|
u) export ANSIBLE_REMOTE_USER="$OPTARG";;
|
||||||
m) SKANSIBLE_MODE="$OPTARG";;
|
m) SKANSIBLE_MODE="$OPTARG";;
|
||||||
|
d) SKANSIBLE_FQDN="$OPTARG";;
|
||||||
*) echo "Err: Invalid option set"; exit 1;;
|
*) echo "Err: Invalid option set"; exit 1;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
@@ -155,23 +157,23 @@ if [[ "$1" == "bootstrap" ]]; then
|
|||||||
# SKANSIBLE_CONN_HOST=staging${SKANSIBLE_STAGE}.test
|
# SKANSIBLE_CONN_HOST=staging${SKANSIBLE_STAGE}.test
|
||||||
if [[ "$SKANSIBLE_STAGE" == 0 ]]; then
|
if [[ "$SKANSIBLE_STAGE" == 0 ]]; then
|
||||||
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
||||||
ansible-playbook -CKk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
ansible-playbook -CKk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
else
|
else
|
||||||
ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
fi
|
fi
|
||||||
elif [[ "$SKANSIBLE_STAGE" == 1 ]]; then
|
elif [[ "$SKANSIBLE_STAGE" == 1 ]]; then
|
||||||
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
if [[ "$SKANSIBLE_UNITTEST" == "True" ]]; then
|
||||||
ansible-playbook -CK -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
ansible-playbook -CK -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
else
|
else
|
||||||
ansible-playbook -K -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
ansible-playbook -K -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=${SKANSIBLE_MODE}" --extra-vars "fqdn=${SKANSIBLE_FQDN:-staging.test}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if [[ -z "$SKANSIBLE_CONN_HOST" ]]; then
|
if [[ -z "$SKANSIBLE_CONN_HOST" ]]; then
|
||||||
echo "When not doing staging, chosen or preferred host must be made explicit"
|
echo "When not doing staging, chosen or preferred host must be made explicit as well as desired FQDN"
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=prod" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
ansible-playbook -Kk -i hosts.yml --extra-vars "chosen_host=${SKANSIBLE_CONN_HOST}" --extra-vars "chosen_user=${ANSIBLE_REMOTE_USER:-senpai}" --extra-vars "mode=prod" --extra-vars "fqdn=${SKANSIBLE_FQDN}" "administrate@${SKANSIBLE_PLAY_HOST}.yml"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user