summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-05-31 15:25:41 -0400
committerScott Dodson <sdodson@redhat.com>2017-06-01 14:55:57 -0400
commit4ef83afdfdf4bf687b64ffb11dd1294ef7f84bf7 (patch)
tree2c1e4213d654709dd469ef4507ffcca93354b90d /roles
parent1374e3b96986f35b86e947e06803a01c62be31ed (diff)
downloadopenshift-4ef83afdfdf4bf687b64ffb11dd1294ef7f84bf7.tar.gz
openshift-4ef83afdfdf4bf687b64ffb11dd1294ef7f84bf7.tar.bz2
openshift-4ef83afdfdf4bf687b64ffb11dd1294ef7f84bf7.tar.xz
openshift-4ef83afdfdf4bf687b64ffb11dd1294ef7f84bf7.zip
Add mtu setting to /etc/sysconfig/docker-network
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1457062
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/tasks/package_docker.yml15
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml3
2 files changed, 18 insertions, 0 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml
index e101730d2..c82d8659a 100644
--- a/roles/docker/tasks/package_docker.yml
+++ b/roles/docker/tasks/package_docker.yml
@@ -102,6 +102,21 @@
notify:
- restart docker
+- stat: path=/etc/sysconfig/docker-network
+ register: sysconfig_docker_network_check
+
+- name: Configure Docker Network OPTIONS
+ lineinfile:
+ dest: /etc/sysconfig/docker-network
+ regexp: '^DOCKER_NETWORK_OPTIONS=.*$'
+ line: "DOCKER_NETWORK_OPTIONS='\
+ {% if openshift.node is defined and openshift.node.sdn_mtu is defined %} --mtu={{ openshift.node.sdn_mtu }}{% endif %}'"
+ when:
+ - sysconfig_docker_network_check.stat.isreg is defined
+ - sysconfig_docker_network_check.stat.isreg
+ notify:
+ - restart docker
+
- name: Start the Docker service
systemd:
name: docker
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml
index 350512452..95e94171d 100644
--- a/roles/openshift_docker_facts/tasks/main.yml
+++ b/roles/openshift_docker_facts/tasks/main.yml
@@ -17,6 +17,9 @@
hosted_registry_insecure: "{{ openshift_docker_hosted_registry_insecure | default(openshift.docker.hosted_registry_insecure | default(False)) }}"
hosted_registry_network: "{{ openshift_docker_hosted_registry_network | default(None) }}"
use_system_container: "{{ openshift_docker_use_system_container | default(False) }}"
+ - role: node
+ local_facts:
+ sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}"
- set_fact:
docker_additional_registries: "{{ openshift.docker.additional_registries