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
221b429c
Unverified
Commit
221b429c
authored
5 years ago
by
Sergey
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
move var preinstall_selinux_state: to roles/kubespray-defaults/defaults/main.yaml (#5715)
parent
b937d1cd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/preinstall/defaults/main.yml
+0
-2
0 additions, 2 deletions
roles/kubernetes/preinstall/defaults/main.yml
roles/kubespray-defaults/defaults/main.yaml
+3
-0
3 additions, 0 deletions
roles/kubespray-defaults/defaults/main.yaml
with
3 additions
and
2 deletions
roles/kubernetes/preinstall/defaults/main.yml
+
0
−
2
View file @
221b429c
...
...
@@ -35,8 +35,6 @@ resolveconf_cloud_init_conf: /etc/resolveconf_cloud_init.conf
# All inventory hostnames will be written into each /etc/hosts file.
populate_inventory_to_hosts_file
:
true
preinstall_selinux_state
:
permissive
sysctl_file_path
:
"
/etc/sysctl.d/99-sysctl.conf"
etc_hosts_localhost_entries
:
...
...
This diff is collapsed.
Click to expand it.
roles/kubespray-defaults/defaults/main.yaml
+
3
−
0
View file @
221b429c
...
...
@@ -3,6 +3,9 @@
# This change obseletes editing ansible.cfg file depending on bastion existence
ansible_ssh_common_args
:
"
{%
if
'bastion'
in
groups['all']
%}
-o
ProxyCommand='ssh
-o
UserKnownHostsFile=/dev/null
-o
StrictHostKeyChecking=no
-W
%h:%p
{{
hostvars['bastion']['ansible_user']
}}@{{
hostvars['bastion']['ansible_host']
}}
{%
if
ansible_ssh_private_key_file
is
defined
%}-i
{{
ansible_ssh_private_key_file
}}{%
endif
%}
'
{%
endif
%}"
# selinux state
preinstall_selinux_state
:
permissive
kube_api_anonymous_auth
:
true
# Default value, but will be set to true automatically if detected
...
...
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