Merge pull request #2061 from mwhudson/no-pro-for-core

do not offer to enable Pro for core installs
canonical · Aug 21, 2024 · 086cba9 · 086cba9
2 parents 2fc5a09 + a7d77c9
commit 086cba9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/examples/answers/uc24.yaml b/examples/answers/uc24.yaml
@@ -16,8 +16,6 @@ Proxy:
 Filesystem:
   guided: yes
   guided-index: 0
-UbuntuPro:
-  token: ""
 InstallProgress:
   reboot: yes
 Drivers:

diff --git a/subiquity/server/controller.py b/subiquity/server/controller.py
@@ -53,6 +53,7 @@ def __init__(self, app):
     async def _confirmed(self):
         variant = self.app.base_model.source.current.variant
         if variant not in self.interactive_for_variants:
+            log.debug(f"disabling {self.name} as it is not interactive for {variant}")
             await self.configured()
             self._active = False
 

diff --git a/subiquity/server/controllers/ubuntu_pro.py b/subiquity/server/controllers/ubuntu_pro.py
@@ -87,6 +87,8 @@ class UbuntuProController(SubiquityController):
         },
     }
 
+    interactive_for_variants = {"desktop", "server"}
+
     def __init__(self, app) -> None:
         """Initializer for server-side Ubuntu Pro controller."""
         strategy: UAInterfaceStrategy