diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-23 04:23:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 04:23:30 -0700 |
| commit | 75fc5ef69b792d9595918383286b0d9e45eda848 (patch) | |
| tree | ada09bad9eab0c27ee2c7b7829876acf6d3531d6 /roles/openshift_node/tasks | |
| parent | 1a0f460eb67f1a6fa82385faa91df4edd4b9d7d3 (diff) | |
| parent | c7b7ff56ab5365e74a5a6516b64a0a86a8218d12 (diff) | |
| download | openshift-75fc5ef69b792d9595918383286b0d9e45eda848.tar.gz openshift-75fc5ef69b792d9595918383286b0d9e45eda848.tar.bz2 openshift-75fc5ef69b792d9595918383286b0d9e45eda848.tar.xz openshift-75fc5ef69b792d9595918383286b0d9e45eda848.zip | |
Merge pull request #5813 from ashcrow/1503903
Automatic merge from submit-queue.
Always ensure atomic.conf is configured for system containers.
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
Diffstat (limited to 'roles/openshift_node/tasks')
| -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 }} |