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
3016ab79
Commit
3016ab79
authored
9 years ago
by
Antoine Legrand
Browse files
Options
Downloads
Plain Diff
Merge pull request #129 from Smana/fedora_23_compat
fix some issues with fedora 23 and dnf
parents
98e2d695
b2d66263
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
roles/docker/tasks/main.yml
+0
-2
0 additions, 2 deletions
roles/docker/tasks/main.yml
roles/docker/vars/fedora.yml
+1
-1
1 addition, 1 deletion
roles/docker/vars/fedora.yml
roles/kubernetes/master/tasks/main.yml
+2
-2
2 additions, 2 deletions
roles/kubernetes/master/tasks/main.yml
with
3 additions
and
5 deletions
roles/docker/tasks/main.yml
+
0
−
2
View file @
3016ab79
...
@@ -33,7 +33,6 @@
...
@@ -33,7 +33,6 @@
action
:
"
{{
docker_repo_info.pkg_repo
}}"
action
:
"
{{
docker_repo_info.pkg_repo
}}"
args
:
args
:
repo
:
"
{{item}}"
repo
:
"
{{item}}"
update_cache
:
yes
state
:
present
state
:
present
with_items
:
docker_repo_info.repos
with_items
:
docker_repo_info.repos
when
:
docker_repo_info.repos|length >
0
when
:
docker_repo_info.repos|length >
0
...
@@ -42,7 +41,6 @@
...
@@ -42,7 +41,6 @@
action
:
"
{{
docker_package_info.pkg_mgr
}}"
action
:
"
{{
docker_package_info.pkg_mgr
}}"
args
:
args
:
pkg
:
"
{{item}}"
pkg
:
"
{{item}}"
update_cache
:
yes
state
:
latest
state
:
latest
with_items
:
docker_package_info.pkgs
with_items
:
docker_package_info.pkgs
when
:
docker_package_info.pkgs|length >
0
when
:
docker_package_info.pkgs|length >
0
...
...
This diff is collapsed.
Click to expand it.
roles/docker/vars/fedora.yml
+
1
−
1
View file @
3016ab79
...
@@ -3,7 +3,7 @@ docker_kernel_min_version: '0'
...
@@ -3,7 +3,7 @@ docker_kernel_min_version: '0'
docker_package_info
:
docker_package_info
:
pkg_mgr
:
dnf
pkg_mgr
:
dnf
pkgs
:
pkgs
:
-
docker
-io
-
docker
docker_repo_key_info
:
docker_repo_key_info
:
pkg_key
:
'
'
pkg_key
:
'
'
...
...
This diff is collapsed.
Click to expand it.
roles/kubernetes/master/tasks/main.yml
+
2
−
2
View file @
3016ab79
...
@@ -87,7 +87,7 @@
...
@@ -87,7 +87,7 @@
when
:
inventory_hostname == groups['kube-master'][0]
when
:
inventory_hostname == groups['kube-master'][0]
-
name
:
Check if kube-system exists
-
name
:
Check if kube-system exists
command
:
kubectl get ns kube-system
command
:
"
{{
bin_dir
}}/
kubectl
get
ns
kube-system
"
register
:
'
kubesystem'
register
:
'
kubesystem'
changed_when
:
False
changed_when
:
False
ignore_errors
:
yes
ignore_errors
:
yes
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
timeout
:
60
timeout
:
60
-
name
:
Create 'kube-system' namespace
-
name
:
Create 'kube-system' namespace
command
:
kubectl create -f /etc/kubernetes/kube-system-ns.yml
command
:
"
{{
bin_dir
}}/
kubectl
create
-f
/etc/kubernetes/kube-system-ns.yml
"
changed_when
:
False
changed_when
:
False
when
:
kubesystem|failed and inventory_hostname == groups['kube-master'][0]
when
:
kubesystem|failed and inventory_hostname == groups['kube-master'][0]
...
...
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