diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-07-28 11:24:12 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-08-03 17:20:52 +0200 |
| commit | 0a020bae8b93a53271c940714c8701d5e63db5f0 (patch) | |
| tree | e076b9598980defd2dc4f6d07b2d3b9985b1eaa6 | |
| parent | 2ea7c0d02d7bc10b3bb6313b13c3bbf37ca4a67c (diff) | |
| download | openshift-0a020bae8b93a53271c940714c8701d5e63db5f0.tar.gz openshift-0a020bae8b93a53271c940714c8701d5e63db5f0.tar.bz2 openshift-0a020bae8b93a53271c940714c8701d5e63db5f0.tar.xz openshift-0a020bae8b93a53271c940714c8701d5e63db5f0.zip | |
openvswitch: system container depends on the cri-o service
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | roles/openshift_node/tasks/openvswitch_system_container.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml index c8d653880..3254b35d6 100644 --- a/roles/openshift_node/tasks/openvswitch_system_container.yml +++ b/roles/openshift_node/tasks/openvswitch_system_container.yml @@ -1,4 +1,15 @@ --- +- set_fact: + l_use_crio: "{{ openshift_docker_use_crio | default(false) }}" + +- set_fact: + l_service_name: "cri-o" + when: l_use_crio + +- set_fact: + l_service_name: "{{ openshift.docker.service_name }}" + when: not l_use_crio + - name: Pre-pull OpenVSwitch system container image command: > atomic pull --storage=ostree {{ openshift.common.system_images_registry }}/{{ openshift.node.ovs_system_image }}:{{ openshift_image_tag }} @@ -11,4 +22,4 @@ image: "{{ openshift.common.system_images_registry }}/{{ openshift.node.ovs_system_image }}:{{ openshift_image_tag }}" state: latest values: - - "DOCKER_SERVICE={{ openshift.docker.service_name }}.service" + - "DOCKER_SERVICE={{ l_service_name }}" |