From dab3f6ee3fb83e0f844793661e1e2253ebb8ad7c Mon Sep 17 00:00:00 2001 From: John Fulton Date: Thu, 31 Jan 2019 16:17:20 -0500 Subject: [PATCH] Fix CNI error when net=host is not used in some podman calls With 'podman version 1.0.0' on RHEL8 beta the 'get ceph version' and 'ceph monitor mkfs' commands fail [1] with "error configuring network namespace for container Missing CNI default network". When net=host is added these errors are resolved. net=host is used in many other calls (grep -R net=host | wc -l --> 38). Fixes: #3561 Signed-off-by: John Fulton (cherry picked from commit 410abd77455a92a85f0674577e22af0af894964f) --- roles/ceph-container-common/tasks/main.yml | 2 +- roles/ceph-mon/tasks/deploy_monitors.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-container-common/tasks/main.yml b/roles/ceph-container-common/tasks/main.yml index 01ebd2ccf..418d3594a 100644 --- a/roles/ceph-container-common/tasks/main.yml +++ b/roles/ceph-container-common/tasks/main.yml @@ -25,7 +25,7 @@ - name: get ceph version command: > - {{ container_binary }} run --rm --entrypoint /usr/bin/ceph + {{ container_binary }} run --rm --net=host --entrypoint /usr/bin/ceph {{ ceph_client_docker_registry }}/{{ ceph_client_docker_image }}:{{ ceph_client_docker_image_tag }} --version changed_when: false diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml index 6ebafa460..d89c5e89f 100644 --- a/roles/ceph-mon/tasks/deploy_monitors.yml +++ b/roles/ceph-mon/tasks/deploy_monitors.yml @@ -78,7 +78,7 @@ - name: set_fact ceph-authtool container command set_fact: - ceph_authtool_cmd: "{{ container_binary + ' run --rm -v /var/lib/ceph:/var/lib/ceph:z -v /etc/ceph/:/etc/ceph/:z --entrypoint=ceph-authtool ' + ceph_client_docker_registry + '/' + ceph_client_docker_image + ':' + ceph_client_docker_image_tag if containerized_deployment else 'ceph-authtool' }}" + ceph_authtool_cmd: "{{ container_binary + ' run --net=host --rm -v /var/lib/ceph:/var/lib/ceph:z -v /etc/ceph/:/etc/ceph/:z --entrypoint=ceph-authtool ' + ceph_client_docker_registry + '/' + ceph_client_docker_image + ':' + ceph_client_docker_image_tag if containerized_deployment else 'ceph-authtool' }}" - name: import admin keyring into mon keyring command: > -- 2.39.5