1
diff --git a/snap/local/tree/bin/maas-deb-migrate b/snap/local/tree/bin/maas-deb-migrate
2
index fea33f4..febca85 100755
3
--- a/snap/local/tree/bin/maas-deb-migrate
4
+++ b/snap/local/tree/bin/maas-deb-migrate
5
@@ -68,6 +68,15 @@ apply_db_patches() {
6
68
    if maas_snap_mode | grep -q "region"; then
68
    if maas_snap_mode | grep -q "region"; then
7
69
        snap_run "maas-region migrate"
69
        snap_run "maas-region migrate"
8
70
    fi
70
    fi
9
71
10
72
    # patch the value of the default cloud images keyring to point to the one
11
73
    # in the snap
12
74
    local keyring="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg"
13
75
    cat <<EOF | pg_do psql maasdb
14
76
UPDATE maasserver_bootsource
15
77
SET keyring_filename = '${MAAS_SNAP}${keyring}'
16
78
WHERE keyring_filename = '${keyring}'
17
79
EOF
18
71
}
80
}
19
72
81
20
73
configure_supervisord() {
82
configure_supervisord() {
21
diff --git a/src/maasserver/bootsources.py b/src/maasserver/bootsources.py
22
index f36e617..9e9d32a 100644
23
--- a/src/maasserver/bootsources.py
24
+++ b/src/maasserver/bootsources.py
25
@@ -79,6 +79,15 @@ def ensure_boot_source_definition():
26
79
        )
79
        )
27
80
        return True
80
        return True
28
81
    else:
81
    else:
29
82
        # XXX ensure the default keyrings path in the database points to the
30
83
        # right file when running in a snap. (see lp:1890468) The
31
84
        # DEFAULT_KEYRINGS_PATH points to the right file whether running from
32
85
        # deb or snap, but the path stored in the DB might be wrong if a
33
86
        # snap-to-deb transition happened with a script without the fix.
34
87
        if os.environ.get("SNAP"):
35
88
            BootSource.objects.filter(url=DEFAULT_IMAGES_URL).update(
36
89
                keyring_filename=DEFAULT_KEYRINGS_PATH
37
90
            )
38
82
        return False
91
        return False
39
83
92
40
84
93
41
diff --git a/src/maasserver/tests/test_bootsources.py b/src/maasserver/tests/test_bootsources.py
42
index 2c4f6ea..01db0c0 100644
43
--- a/src/maasserver/tests/test_bootsources.py
44
+++ b/src/maasserver/tests/test_bootsources.py
45
@@ -11,6 +11,7 @@ import random
46
11
from unittest import skip
11
from unittest import skip
47
12
from unittest.mock import ANY, MagicMock
12
from unittest.mock import ANY, MagicMock
48
13
13
49
14
from fixtures import EnvironmentVariableFixture
50
14
from requests.exceptions import ConnectionError
15
from requests.exceptions import ConnectionError
51
15
from testtools.matchers import HasLength
16
from testtools.matchers import HasLength
52
16
17
53
@@ -44,6 +45,7 @@ from maasserver.testing.testcase import (
54
44
)
45
)
55
45
from maasserver.tests.test_bootresources import SimplestreamsEnvFixture
46
from maasserver.tests.test_bootresources import SimplestreamsEnvFixture
56
46
from maasserver.utils import get_maas_user_agent
47
from maasserver.utils import get_maas_user_agent
57
48
from maasserver.utils.orm import reload_object
58
47
from maastesting.djangotestcase import count_queries
49
from maastesting.djangotestcase import count_queries
59
48
from maastesting.matchers import MockCalledOnceWith
50
from maastesting.matchers import MockCalledOnceWith
60
49
from provisioningserver.config import DEFAULT_IMAGES_URL
51
from provisioningserver.config import DEFAULT_IMAGES_URL
61
@@ -141,6 +143,28 @@ class TestHelpers(MAASServerTestCase):
62
141
            },
143
            },
63
142
        )
144
        )
64
143
145
65
146
    def test_ensure_boot_source_definition_updates_default_source_snap(self):
66
147
        BootSource.objects.all().delete()
67
148
        self.assertTrue(ensure_boot_source_definition())
68
149
        source = BootSource.objects.first()
69
150
        self.assertEqual(
70
151
            source.keyring_filename,
71
152
            "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg",
72
153
        )
73
154
        self.useFixture(
74
155
            EnvironmentVariableFixture("SNAP", "/snap/maas/current")
75
156
        )
76
157
        self.patch(
77
158
            bootsources,
78
159
            "DEFAULT_KEYRINGS_PATH",
79
160
            "/some/other/path/keyring.gpg",
80
161
        )
81
162
        self.assertFalse(ensure_boot_source_definition())
82
163
        source = reload_object(source)
83
164
        self.assertEqual(
84
165
            source.keyring_filename, "/some/other/path/keyring.gpg"
85
166
        )
86
167
87
144
    def test_ensure_boot_source_definition_creates_with_default_arch(self):
168
    def test_ensure_boot_source_definition_creates_with_default_arch(self):
88
145
        BootSource.objects.all().delete()
169
        BootSource.objects.all().delete()
89
146
        mock_get_architecture = self.patch(bootsources, "get_architecture")
170
        mock_get_architecture = self.patch(bootsources, "get_architecture")
Reviewer	Date Requested	Status
Björn Tillenius		Approve on 2020-10-12
MAAS Lander		Approve on 2020-10-12
Dougal Matthews (community)	2020-10-12	Approve on 2020-10-12
Review via email: mp+392133@code.launchpad.net