diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-17 20:41:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 20:41:17 -0500 |
| commit | 84fb45dae49c0ff0ebc71222a74ff4729ead06c0 (patch) | |
| tree | 06e50dbfab4f5882daaf0ef142916ea4c5e2f13a /roles/openshift_node/tasks/node_system_container.yml | |
| parent | 8b71c2938d278f4418db0fdad1bf6f94585e87c7 (diff) | |
| parent | 42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da (diff) | |
| download | openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.tar.gz openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.tar.bz2 openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.tar.xz openshift-84fb45dae49c0ff0ebc71222a74ff4729ead06c0.zip | |
Merge pull request #6456 from mgugino-upstream-stage/node-facts
Remove openshift_node_facts part 1
Diffstat (limited to 'roles/openshift_node/tasks/node_system_container.yml')
| -rw-r--r-- | roles/openshift_node/tasks/node_system_container.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml index 98978ec6f..06b879050 100644 --- a/roles/openshift_node/tasks/node_system_container.yml +++ b/roles/openshift_node/tasks/node_system_container.yml @@ -2,14 +2,14 @@ - name: Pre-pull node system container image command: > - atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }} + atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osn_image }}:{{ openshift_image_tag }} register: pull_result changed_when: "'Pulling layer' in pull_result.stdout" - name: Install or Update node system container oc_atomic_container: name: "{{ openshift_service_type }}-node" - image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }}" + image: "{{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ osn_image }}:{{ openshift_image_tag }}" values: - "DNS_DOMAIN={{ openshift.common.dns_domain }}" - "DOCKER_SERVICE={{ openshift_docker_service_name }}.service" |