Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
01a13027
Commit
01a13027
authored
7 years ago
by
Abdelsalam Abbas
Committed by
Matthew Mosesohn
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix issues with if condition (#1537)
parent
3c710219
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/azurerm/apply-rg.sh
+2
-2
2 additions, 2 deletions
contrib/azurerm/apply-rg.sh
contrib/azurerm/clear-rg.sh
+1
-1
1 addition, 1 deletion
contrib/azurerm/clear-rg.sh
contrib/azurerm/generate-inventory.sh
+2
-2
2 additions, 2 deletions
contrib/azurerm/generate-inventory.sh
with
5 additions
and
5 deletions
contrib/azurerm/apply-rg.sh
+
2
−
2
View file @
01a13027
...
...
@@ -9,10 +9,10 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
exit
1
fi
if
[
$(
az &>/dev/null
)
]
;
then
if
az &>/dev/null
;
then
echo
"azure cli 2.0 found, using it instead of 1.0"
./apply-rg_2.sh
"
$AZURE_RESOURCE_GROUP
"
elif
[
$(
azure &>/dev/null
)
]
;
then
elif
azure &>/dev/null
;
then
ansible-playbook generate-templates.yml
azure group deployment create
-f
./.generated/network.json
-g
$AZURE_RESOURCE_GROUP
...
...
This diff is collapsed.
Click to expand it.
contrib/azurerm/clear-rg.sh
+
1
−
1
View file @
01a13027
...
...
@@ -9,7 +9,7 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
exit
1
fi
if
[
$(
az &>/dev/null
)
]
;
then
if
az &>/dev/null
;
then
echo
"azure cli 2.0 found, using it instead of 1.0"
./clear-rg_2.sh
"
$AZURE_RESOURCE_GROUP
"
else
...
...
This diff is collapsed.
Click to expand it.
contrib/azurerm/generate-inventory.sh
+
2
−
2
View file @
01a13027
...
...
@@ -9,9 +9,9 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
exit
1
fi
# 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
"
elif
[
$(
azure &>/dev/null
)
]
;
then
elif
azure &>/dev/null
;
then
ansible-playbook generate-inventory.yml
-e
azure_resource_group
=
"
$AZURE_RESOURCE_GROUP
"
else
echo
"Azure cli not found"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment