diff options
| author | Steve Milner <smilner@redhat.com> | 2017-10-19 11:29:19 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-10-19 11:29:19 -0400 |
| commit | c7b7ff56ab5365e74a5a6516b64a0a86a8218d12 (patch) | |
| tree | 2a3bb0b35dc78eec992570278bbfae3daf2edbc4 /roles/openshift_node | |
| parent | 61cca52ea383d75aa4c20cf0e96936a5188084e9 (diff) | |
| download | openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.tar.gz openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.tar.bz2 openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.tar.xz openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.zip | |
systemcontainers: Verify atomic.conf proxy is always configured
A new openshift_atomic role has been created for atomic specific tasks.
The first task added is proxy which handles updating /etc/atomic.conf to
ensure the proper proxy configuration is configured. This task file is
then included (via include_role) in system container related task files.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903
Signed-off-by: Steve Milner <smilner@redhat.com>
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/tasks/node_system_container.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/openvswitch_system_container.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index 20d7a9539..164a79b39 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -1,4 +1,9 @@ --- +- name: Ensure proxies are in the atomic.conf + include_role: + name: openshift_atomic + tasks_from: proxy + - name: Pre-pull node system container image command: > atomic pull --storage=ostree {{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }} diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml index e09063aa5..0f73ce454 100644 --- a/roles/openshift_node/tasks/openvswitch_system_container.yml +++ b/roles/openshift_node/tasks/openvswitch_system_container.yml @@ -10,6 +10,11 @@ l_service_name: "{{ openshift.docker.service_name }}" when: not l_use_crio +- name: Ensure proxies are in the atomic.conf + include_role: + name: openshift_atomic + tasks_from: proxy + - name: Pre-pull OpenVSwitch system container image command: > atomic pull --storage=ostree {{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.node.ovs_system_image }}:{{ openshift_image_tag }} |