diff --git a/subiquity/server/apt.py b/subiquity/server/apt.py index 19c30c08..1bc88f66 100644 --- a/subiquity/server/apt.py +++ b/subiquity/server/apt.py @@ -112,9 +112,9 @@ class AptConfigurer: self.install_tree: Optional[OverlayMountpoint] = None self.install_mount = None - def apt_config(self, elected: bool): + def apt_config(self, final: bool): cfg = {} - if elected: + if final: merge_config(cfg, self.app.base_model.mirror.get_apt_config_elected()) else: @@ -123,12 +123,12 @@ class AptConfigurer: merge_config(cfg, self.app.base_model.proxy.get_apt_config()) return {'apt': cfg} - async def apply_apt_config(self, context, elected: bool): + async def apply_apt_config(self, context, final: bool): self.configured_tree = await self.mounter.setup_overlay([self.source]) config_location = os.path.join( self.app.root, 'var/log/installer/subiquity-curtin-apt.conf') - generate_config_yaml(config_location, self.apt_config(elected)) + generate_config_yaml(config_location, self.apt_config(final)) self.app.note_data_for_apport("CurtinAptConfig", config_location) await run_curtin_command( diff --git a/subiquity/server/controllers/mirror.py b/subiquity/server/controllers/mirror.py index 9fcc990c..098d8a8f 100644 --- a/subiquity/server/controllers/mirror.py +++ b/subiquity/server/controllers/mirror.py @@ -241,11 +241,11 @@ class MirrorController(SubiquityController): # recommended. Clients should do a POST request to /mirror with # null as the body instead. await self.find_and_elect_candidate_mirror(self.context) - await self.apt_configurer.apply_apt_config(self.context, elected=True) + await self.apt_configurer.apply_apt_config(self.context, final=True) async def run_mirror_testing(self, output: io.StringIO) -> None: await self.source_configured_event.wait() - await self.apt_configurer.apply_apt_config(self.context, elected=False) + await self.apt_configurer.apply_apt_config(self.context, final=False) await self.apt_configurer.run_apt_config_check(output) async def wait_config(self): diff --git a/subiquity/server/tests/test_apt.py b/subiquity/server/tests/test_apt.py index f82d72e9..3e6423ec 100644 --- a/subiquity/server/tests/test_apt.py +++ b/subiquity/server/tests/test_apt.py @@ -68,7 +68,7 @@ class TestAptConfigurer(SubiTestCase): self.astart_sym = "subiquity.server.apt.astart_command" def test_apt_config_noproxy(self): - config = self.configurer.apt_config(elected=True) + config = self.configurer.apt_config(final=True) self.assertNotIn("http_proxy", config["apt"]) self.assertNotIn("https_proxy", config["apt"]) @@ -76,7 +76,7 @@ class TestAptConfigurer(SubiTestCase): proxy = 'http://apt-cacher-ng:3142' self.model.proxy.proxy = proxy - config = self.configurer.apt_config(elected=True) + config = self.configurer.apt_config(final=True) self.assertEqual(proxy, config["apt"]["http_proxy"]) self.assertEqual(proxy, config["apt"]["https_proxy"])