Skip to content

cephadm: ignore apparmor if profiles file is empty#40555

Merged
tchaikov merged 1 commit intoceph:masterfrom
jecluis:wip-cephadm-fix-apparmor.master
Apr 3, 2021
Merged

cephadm: ignore apparmor if profiles file is empty#40555
tchaikov merged 1 commit intoceph:masterfrom
jecluis:wip-cephadm-fix-apparmor.master

Conversation

@jecluis
Copy link
Member

@jecluis jecluis commented Apr 1, 2021

If /sys/kernel/security/apparmor/profiles happens to be empty, cephadm will end up failing trying to split an empty line. Instead, return an empty dictionary.

Signed-off-by: Joao Eduardo Luis <joao@suse.com>

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
@tchaikov tchaikov merged commit 9d00ec5 into ceph:master Apr 3, 2021
@tchaikov
Copy link
Contributor

seems this change addresses https://tracker.ceph.com/issues/50693

mgfritch added a commit to mgfritch/aquarium that referenced this pull request May 25, 2021
- Ceph Pacific v16.2.4 + latest backports

- includes upstream backport of:
  - ceph/ceph#40411
  - ceph/ceph#40555
  - ceph/ceph#40463

Signed-off-by: Michael Fritch <mfritch@suse.com>
mgfritch added a commit to mgfritch/aquarium that referenced this pull request May 25, 2021
- Ceph Pacific v16.2.4 + latest backports

- includes upstream backport of:
  - ceph/ceph#40411
  - ceph/ceph#40555
  - ceph/ceph#40463

Resolves: aquarist-labs#389
Signed-off-by: Michael Fritch <mfritch@suse.com>
mgfritch added a commit to mgfritch/aquarium that referenced this pull request May 25, 2021
- Ceph Pacific v16.2.4 + latest backports
- includes upstream backport of:
  - ceph/ceph#40411
  - ceph/ceph#40555
  - ceph/ceph#40463

Resolves: aquarist-labs#389
Signed-off-by: Michael Fritch <mfritch@suse.com>
mgfritch added a commit to mgfritch/aquarium that referenced this pull request May 25, 2021
- Ceph Pacific v16.2.4 + latest backports
- includes upstream backport of:
  - ceph/ceph#40555
  - ceph/ceph#40463

Resolves: aquarist-labs#389
Signed-off-by: Michael Fritch <mfritch@suse.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants