diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-16 02:58:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 02:58:56 -0700 |
| commit | b124c678a9ac8c723f3576a03276de7cfd051931 (patch) | |
| tree | 824d71785339e3a73b04a3a7b58b5cd31d0fd10b /roles/openshift_node | |
| parent | 37d6601922aae3420f52e36b55876beece585ab6 (diff) | |
| parent | ba22ab302392586bc26b8ffec89b095114e68923 (diff) | |
| download | openshift-b124c678a9ac8c723f3576a03276de7cfd051931.tar.gz openshift-b124c678a9ac8c723f3576a03276de7cfd051931.tar.bz2 openshift-b124c678a9ac8c723f3576a03276de7cfd051931.tar.xz openshift-b124c678a9ac8c723f3576a03276de7cfd051931.zip | |
Merge pull request #5334 from juanluisvaladas/move-sysctl
Automatic merge from submit-queue
Move sysctl.conf customizations to a separate file
Move them from /etc/sysctl.conf to /etc/sysctl.d/99-openshift.conf
This is a good idea becuase:
1- /etc/sysctl.conf is evaluated later, so it can easily be overwritten by previous customizations
2- It's likely that there is an agent like puppet monitoring this file
3- It's easier to know what's being changed by OpenShift
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/handlers/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/roles/openshift_node/handlers/main.yml b/roles/openshift_node/handlers/main.yml index 855b0a8d8..25a6fc721 100644 --- a/roles/openshift_node/handlers/main.yml +++ b/roles/openshift_node/handlers/main.yml @@ -29,8 +29,5 @@ - not (node_service_status_changed | default(false) | bool) - not openshift_node_bootstrap -- name: reload sysctl.conf - command: /sbin/sysctl -p - - name: reload systemd units command: systemctl daemon-reload diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index ff8d1942c..28238a8fa 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -59,14 +59,11 @@ # The atomic-openshift-node service will set this parameter on # startup, but if the network service is restarted this setting is # lost. Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1372388 -# -# Use lineinfile w/ a handler for this task until -# https://github.com/ansible/ansible/pull/24277 is included in an -# ansible release and we can use the sysctl module. -- name: Persist net.ipv4.ip_forward sysctl entry - lineinfile: dest=/etc/sysctl.conf regexp='^net.ipv4.ip_forward' line='net.ipv4.ip_forward=1' - notify: - - reload sysctl.conf +- sysctl: + name: net.ipv4.ip_forward + value: 1 + sysctl_file: "/etc/sysctl.d/99-openshift.conf" + reload: yes - name: include bootstrap node config include: bootstrap.yml |