C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix issues with if condition (#1537)

Browse source
This commit is contained in:
Abdelsalam Abbas 2017-08-20 12:55:13 +02:00 committed by Matthew Mosesohn
parent 3c710219a1
commit 01a130273f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/azurerm/apply-rg.sh
View file

@ -9,10 +9,10 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
exit 1 exit 1
fi fi
if [ $(az &>/dev/null) ] ; then if az &>/dev/null; then
echo "azure cli 2.0 found, using it instead of 1.0" echo "azure cli 2.0 found, using it instead of 1.0"
./apply-rg_2.sh "$AZURE_RESOURCE_GROUP" ./apply-rg_2.sh "$AZURE_RESOURCE_GROUP"
elif [ $(azure &>/dev/null) ] ; then elif azure &>/dev/null; then
ansible-playbook generate-templates.yml ansible-playbook generate-templates.yml
azure group deployment create -f ./.generated/network.json -g $AZURE_RESOURCE_GROUP azure group deployment create -f ./.generated/network.json -g $AZURE_RESOURCE_GROUP

2
contrib/azurerm/clear-rg.sh
View file

@ -9,7 +9,7 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
exit 1 exit 1
fi fi
if [ $(az &>/dev/null) ] ; then if az &>/dev/null; then
echo "azure cli 2.0 found, using it instead of 1.0" echo "azure cli 2.0 found, using it instead of 1.0"
./clear-rg_2.sh "$AZURE_RESOURCE_GROUP" ./clear-rg_2.sh "$AZURE_RESOURCE_GROUP"
else else

4
contrib/azurerm/generate-inventory.sh
View file

@ -9,9 +9,9 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
exit 1 exit 1
fi fi
# check if azure cli 2.0 exists else use azure cli 1.0 # check if azure cli 2.0 exists else use azure cli 1.0
if [ $(az &>/dev/null) ] ; then if az &>/dev/null; then
ansible-playbook generate-inventory_2.yml -e azure_resource_group="$AZURE_RESOURCE_GROUP" ansible-playbook generate-inventory_2.yml -e azure_resource_group="$AZURE_RESOURCE_GROUP"
elif [ $(azure &>/dev/null) ]; then elif azure &>/dev/null; then
ansible-playbook generate-inventory.yml -e azure_resource_group="$AZURE_RESOURCE_GROUP" ansible-playbook generate-inventory.yml -e azure_resource_group="$AZURE_RESOURCE_GROUP"
else else
echo "Azure cli not found" echo "Azure cli not found"