summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node/tasks/node_system_container.yml
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-12 17:54:20 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-14 11:01:53 -0500
commit42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da (patch)
treef569ee5399fdda29e97ef811ce5485c66ebd6557 /roles/openshift_node/tasks/node_system_container.yml
parent51a69d758e188b16126cca6f2791e2a00fe6ebad (diff)
downloadopenshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.tar.gz
openshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.tar.bz2
openshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.tar.xz
openshift-42d3824ba0d5a1e2cff3dc3a179cf02e735bc5da.zip
Remove openshift_node_facts part 1
This commit removes some items from openshift_facts for the openshit_node role.
Diffstat (limited to 'roles/openshift_node/tasks/node_system_container.yml')
-rw-r--r--roles/openshift_node/tasks/node_system_container.yml4
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"