From 1cc0b91ce8ac89021315daa044732171f57c88db Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Fri, 12 May 2017 10:57:04 -0400 Subject: Add no_proxy to atomic.conf Requires: https://github.com/projectatomic/atomic/pull/999 --- roles/docker/tasks/systemcontainer_docker.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index c85801546..44f56aede 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -41,7 +41,7 @@ daemon_reload: yes ignore_errors: True -# Set http_proxy and https_proxy in /etc/atomic.conf +# Set http_proxy, https_proxy, and no_proxy in /etc/atomic.conf - block: - name: Add http_proxy to /etc/atomic.conf @@ -60,6 +60,14 @@ - openshift.common.https_proxy is defined - openshift.common.https_proxy != '' + - name: Add no_proxy to /etc/atomic.conf + lineinfile: + path: /etc/atomic.conf + line: "no_proxy={{ openshift.common.no_proxy | default('') }}" + when: + - openshift.common.no_proxy is defined + - openshift.common.no_proxy != '' + - block: - name: Set to default prepend -- cgit v1.2.3 From d8916bea8822b6f828d90fd85b026a32070a5883 Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Sun, 14 May 2017 10:32:24 -0400 Subject: Add NO_PROXY workaround for container-engine atomic command Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1450310 --- roles/docker/tasks/systemcontainer_docker.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 44f56aede..e5576d515 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -96,9 +96,13 @@ set_fact: l_docker_image: "{{ l_docker_image_prepend }}/{{ openshift.docker.service_name }}:latest" +# NOTE: no_proxy added as a workaround until https://github.com/projectatomic/atomic/pull/999 is released - name: Pre-pull Container Enginer System Container image command: "atomic pull --storage ostree {{ l_docker_image }}" changed_when: false + environment: + NO_PROXY: "{{ openshift.common.no_proxy | default('') }}" + - name: Ensure container-engine.service.d directory exists file: -- cgit v1.2.3 From 69c26f3bc3b9cefc9df9b3fc1c7d3dd6dea625fe Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Mon, 15 May 2017 10:17:43 -0400 Subject: use dest instead of path for lineinfile Switching to dest instead of path for lineinfile. path is the name for ansible 2.3+ though dest will work for 2.2 and 2.3. Ref: http://docs.ansible.com/ansible/lineinfile_module.html --- roles/docker/tasks/systemcontainer_docker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index e5576d515..9070a871f 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -46,24 +46,24 @@ - name: Add http_proxy to /etc/atomic.conf lineinfile: - path: /etc/atomic.conf - line: "http_proxy={{ openshift.common.http_proxy | default('') }}" + dest: /etc/atomic.conf + line: "http_proxy: {{ openshift.common.http_proxy | default('') }}" when: - openshift.common.http_proxy is defined - openshift.common.http_proxy != '' - name: Add https_proxy to /etc/atomic.conf lineinfile: - path: /etc/atomic.conf - line: "https_proxy={{ openshift.common.https_proxy | default('') }}" + dest: /etc/atomic.conf + line: "https_proxy: {{ openshift.common.https_proxy | default('') }}" when: - openshift.common.https_proxy is defined - openshift.common.https_proxy != '' - name: Add no_proxy to /etc/atomic.conf lineinfile: - path: /etc/atomic.conf - line: "no_proxy={{ openshift.common.no_proxy | default('') }}" + dest: /etc/atomic.conf + line: "no_proxy: {{ openshift.common.no_proxy | default('') }}" when: - openshift.common.no_proxy is defined - openshift.common.no_proxy != '' -- cgit v1.2.3 From 9bc76803f5a14648e367668028fd4386d2cfe56e Mon Sep 17 00:00:00 2001 From: Steve Milner Date: Tue, 16 May 2017 10:55:35 -0400 Subject: Add regexp for container-engine lineinfile This ensures that if the line already exists it will be updated with the expected results from the installer. --- roles/docker/tasks/systemcontainer_docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 9070a871f..3af3e00b2 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -42,11 +42,14 @@ ignore_errors: True # Set http_proxy, https_proxy, and no_proxy in /etc/atomic.conf +# regexp: the line starts with or without #, followed by the string +# http_proxy, then either : or = - block: - name: Add http_proxy to /etc/atomic.conf lineinfile: dest: /etc/atomic.conf + regexp: "^#?http_proxy[:=]{1}" line: "http_proxy: {{ openshift.common.http_proxy | default('') }}" when: - openshift.common.http_proxy is defined @@ -55,6 +58,7 @@ - name: Add https_proxy to /etc/atomic.conf lineinfile: dest: /etc/atomic.conf + regexp: "^#?https_proxy[:=]{1}" line: "https_proxy: {{ openshift.common.https_proxy | default('') }}" when: - openshift.common.https_proxy is defined @@ -63,6 +67,7 @@ - name: Add no_proxy to /etc/atomic.conf lineinfile: dest: /etc/atomic.conf + regexp: "^#?no_proxy[:=]{1}" line: "no_proxy: {{ openshift.common.no_proxy | default('') }}" when: - openshift.common.no_proxy is defined -- cgit v1.2.3