openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not assume the CNI config directory exists"

This commit is contained in:
Zuul 2019-06-06 10:39:56 +00:00 committed by Gerrit Code Review
parent fecc29d481 c0860d58a4
commit dee66d8983
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/podman/podman-baremetal-ansible.yaml
View File

@ -60,11 +60,12 @@ outputs:
package: package:
name: podman name: podman
state: latest state: latest
- name: Remove default cni config for cni0 - name: Remove default cni config for cni0 if exists
copy: copy:
dest: /etc/cni/net.d/87-podman-bridge.conflist dest: /etc/cni/net.d/87-podman-bridge.conflist
content: '' content: ''
force: yes force: yes
ignore_errors: True
- name: Delete cni0 interface if exists - name: Delete cni0 interface if exists
command: ip link delete cni0 command: ip link delete cni0
ignore_errors: True ignore_errors: True
@ -88,11 +89,12 @@ outputs:
- name: Install podman packages on upgrade if missing - name: Install podman packages on upgrade if missing
when: step|int == 3 when: step|int == 3
package: name=podman state=latest package: name=podman state=latest
- name: Remove default cni config for cni0 - name: Remove default cni config for cni0 if exists
copy: copy:
dest: /etc/cni/net.d/87-podman-bridge.conflist dest: /etc/cni/net.d/87-podman-bridge.conflist
content: '' content: ''
force: yes force: yes
ignore_errors: True
- name: Delete cni0 interface if exists - name: Delete cni0 interface if exists
command: ip link delete cni0 command: ip link delete cni0
ignore_errors: True ignore_errors: True