sysctl file should be in defaults so that it can be overriden (#2475)
* sysctl file should be in defaults so that it can be overriden * Change sysctl_file_path to be consistent with roles/kubernetes/preinstall/defaults/main.yml
This commit is contained in:
parent
9168c71359
commit
c3c5817af6
4 changed files with 6 additions and 6 deletions
|
@ -93,6 +93,8 @@ kube_cadvisor_port: 0
|
||||||
# The read-only port for the Kubelet to serve on with no authentication/authorization.
|
# The read-only port for the Kubelet to serve on with no authentication/authorization.
|
||||||
kube_read_only_port: 0
|
kube_read_only_port: 0
|
||||||
|
|
||||||
|
# sysctl_file_path to add sysctl conf to
|
||||||
|
sysctl_file_path: "/etc/sysctl.d/99-sysctl.conf"
|
||||||
|
|
||||||
# For the openstack integration kubelet will need credentials to access
|
# For the openstack integration kubelet will need credentials to access
|
||||||
# openstack apis like nova and cinder. Per default this values will be
|
# openstack apis like nova and cinder. Per default this values will be
|
||||||
|
|
|
@ -61,6 +61,7 @@
|
||||||
name: net.ipv4.ip_local_reserved_ports
|
name: net.ipv4.ip_local_reserved_ports
|
||||||
value: "{{ kube_apiserver_node_port_range }}"
|
value: "{{ kube_apiserver_node_port_range }}"
|
||||||
sysctl_set: yes
|
sysctl_set: yes
|
||||||
|
sysctl_file: "{{ sysctl_file_path }}"
|
||||||
state: present
|
state: present
|
||||||
reload: yes
|
reload: yes
|
||||||
when: kube_apiserver_node_port_range is defined
|
when: kube_apiserver_node_port_range is defined
|
||||||
|
@ -96,6 +97,7 @@
|
||||||
sysctl:
|
sysctl:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: present
|
state: present
|
||||||
|
sysctl_file: "{{ sysctl_file_path }}"
|
||||||
value: 1
|
value: 1
|
||||||
reload: yes
|
reload: yes
|
||||||
when: sysctl_bridge_nf_call_iptables.rc == 0
|
when: sysctl_bridge_nf_call_iptables.rc == 0
|
||||||
|
|
|
@ -31,3 +31,5 @@ resolveconf_cloud_init_conf: /etc/resolveconf_cloud_init.conf
|
||||||
populate_inventory_to_hosts_file: true
|
populate_inventory_to_hosts_file: true
|
||||||
|
|
||||||
preinstall_selinux_state: permissive
|
preinstall_selinux_state: permissive
|
||||||
|
|
||||||
|
sysctl_file_path: "/etc/sysctl.d/99-sysctl.conf"
|
||||||
|
|
|
@ -245,12 +245,6 @@
|
||||||
tags:
|
tags:
|
||||||
- bootstrap-os
|
- bootstrap-os
|
||||||
|
|
||||||
- name: set default sysctl file path
|
|
||||||
set_fact:
|
|
||||||
sysctl_file_path: "/etc/sysctl.d/99-sysctl.conf"
|
|
||||||
tags:
|
|
||||||
- bootstrap-os
|
|
||||||
|
|
||||||
- name: Stat sysctl file configuration
|
- name: Stat sysctl file configuration
|
||||||
stat:
|
stat:
|
||||||
path: "{{sysctl_file_path}}"
|
path: "{{sysctl_file_path}}"
|
||||||
|
|
Loading…
Reference in a new issue