summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-05 09:49:33 -0500
committerGitHub <noreply@github.com>2017-06-05 09:49:33 -0500
commitef53abf24b5e894c08a9ee2927eb6a2de5449f82 (patch)
treeb3ba0e24dea88181fc238c0c632d1f0275423b48
parent186e7224dca778e8c645d195ccb772b50e0bdaaf (diff)
parent4ef83afdfdf4bf687b64ffb11dd1294ef7f84bf7 (diff)
downloadopenshift-ef53abf24b5e894c08a9ee2927eb6a2de5449f82.tar.gz
openshift-ef53abf24b5e894c08a9ee2927eb6a2de5449f82.tar.bz2
openshift-ef53abf24b5e894c08a9ee2927eb6a2de5449f82.tar.xz
openshift-ef53abf24b5e894c08a9ee2927eb6a2de5449f82.zip
Merge pull request #4336 from sdodson/BZ1457062
Merged by openshift-bot
-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