openstack/tripleo-heat-templates
Code Issues Proposed changes

Do not assume the CNI config directory exists

Browse Source 
The upgrade to Stein can fail on task "Remove default cni config for
cni0" with error "Destination directory /etc/cni/net.d does not
exist". Don't fail if the directory doesn't exist.

Change-Id: Ia08ec74917b6d80376f59ce04613432ad0b041ea
Closes-Bug: #1831238
This commit is contained in:
Jiri Stransky 2019-05-31 14:17:57 +02:00
parent 05f4b253b8
commit c0860d58a4
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