MAAS

Merge ~ack/maas:1915021-map-subnet-snap into maas:master

  1. Git
  2. lp:~ack/maas
  3. 1915021-map-subnet-snap
  4. Merge into master
Proposed by Alberto Donato
Status: Merged
Approved by: Alberto Donato
Approved revision: a19b6529d8be0b50aee00149cd89a686999f2556
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ack/maas:1915021-map-subnet-snap
Merge into: maas:master
Diff against target: 21 lines (+2/-1)
1 file modified
snap/snapcraft.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
MAAS Lander Approve
Review via email: mp+397784@code.launchpad.net

Commit message

LP: #1915021 #1915022 - fix subnet mapping in the snap, add nmap

Subnet mapping acquires a lock under /dev/shm which needs to be prefixed with
the snap name

This also adds nmap to the snap, which makes mapping faster

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b 1915021-map-subnet-snap lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7e9835b22bd246584c6fc94f76dc1dacf08b46e9

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b 1915021-map-subnet-snap lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: a19b6529d8be0b50aee00149cd89a686999f2556

review: Approve
Revision history for this message
Lee Trager (ltrager) wrote :

LGTM!

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 90d3c55..03eba67 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -31,7 +31,7 @@ plugs:
6 apps:
7 supervisor:
8 daemon: simple
9- command: bin/run-supervisord
10+ command: bin/ld-preload $SNAP/bin/run-supervisord
11 environment:
12 PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$SNAP/usr/lib/python3.8/dist-packages
13 LD_PRELOAD: $SNAP/usr/lib/stub_initgroups.so
14@@ -101,6 +101,7 @@ parts:
15 - libxtables12
16 - lshw
17 - nginx-core
18+ - nmap
19 - openssh-client
20 - python3-attr
21 - python3-bson

Subscribers

People subscribed via source and target branches