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
f7447837
Commit
f7447837
authored
8 years ago
by
Bogdan Dobrelya
Browse files
Options
Downloads
Patches
Plain Diff
Rename CoreOS fact
Signed-off-by:
Bogdan Dobrelya
<
bogdando@mail.ru
>
parent
6d54d9f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/testcases/030_check-network.yml
+3
-3
3 additions, 3 deletions
tests/testcases/030_check-network.yml
tests/testcases/040_check-network-adv.yml
+3
-3
3 additions, 3 deletions
tests/testcases/040_check-network-adv.yml
with
6 additions
and
6 deletions
tests/testcases/030_check-network.yml
+
3
−
3
View file @
f7447837
...
@@ -3,14 +3,14 @@
...
@@ -3,14 +3,14 @@
tasks
:
tasks
:
-
name
:
Force binaries directory for CoreOS
-
name
:
Force binaries directory for
Container Linux by
CoreOS
set_fact
:
set_fact
:
bin_dir
:
"
/opt/bin"
bin_dir
:
"
/opt/bin"
when
:
ansible_os_family == "CoreOS"
when
:
ansible_os_family == "
Container Linux by
CoreOS"
-
set_fact
:
-
set_fact
:
bin_dir
:
"
/usr/local/bin"
bin_dir
:
"
/usr/local/bin"
when
:
ansible_os_family != "CoreOS"
when
:
ansible_os_family != "
Container Linux by
CoreOS"
-
name
:
Get pod names
-
name
:
Get pod names
shell
:
"
{{bin_dir}}/kubectl
get
pods
-o
json"
shell
:
"
{{bin_dir}}/kubectl
get
pods
-o
json"
...
...
This diff is collapsed.
Click to expand it.
tests/testcases/040_check-network-adv.yml
+
3
−
3
View file @
f7447837
...
@@ -12,14 +12,14 @@
...
@@ -12,14 +12,14 @@
netchecker_port
:
31081
netchecker_port
:
31081
tasks
:
tasks
:
-
name
:
Force binaries directory for CoreOS
-
name
:
Force binaries directory for
Container Linux by
CoreOS
set_fact
:
set_fact
:
bin_dir
:
"
/opt/bin"
bin_dir
:
"
/opt/bin"
when
:
ansible_os_family == "CoreOS"
when
:
ansible_os_family == "
Container Linux by
CoreOS"
-
set_fact
:
-
set_fact
:
bin_dir
:
"
/usr/local/bin"
bin_dir
:
"
/usr/local/bin"
when
:
ansible_os_family != "CoreOS"
when
:
ansible_os_family != "
Container Linux by
CoreOS"
-
name
:
Wait for netchecker server
-
name
:
Wait for netchecker server
shell
:
"
{{
bin_dir
}}/kubectl
get
pods
--namespace
{{netcheck_namespace}}
|
grep
^netchecker-server"
shell
:
"
{{
bin_dir
}}/kubectl
get
pods
--namespace
{{netcheck_namespace}}
|
grep
^netchecker-server"
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
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