Merge pull request #2105 from vamahaja/maas-integration

zmc · web-flow · commit b009fcc8db12 · 2026-01-13T14:54:36.000-07:00
[Lib] Add MAAS (Metal-as-a-Service) provisioner
diff --git a/docs/siteconfig.rst b/docs/siteconfig.rst
@@ -258,6 +258,14 @@ Here is a sample configuration with many of the options set and documented::
       endpoint: http://head.ses.suse.de:5000/
       machine_types: ['type1', 'type2', 'type3']
 
+    # Settings for MaaS (https://maas.io)
+    maas:
+      api_url: http://maas.example.com:5240/MAAS/api/2.0/
+      api_key: <consumer_key>:<consumer_token>:<secret>
+      machine_types: ['typeA', 'typeB']
+      timeout: 900
+      user_data: teuthology/maas/user_data/maas-{os_type}-{os_version}-user-data.txt
+
     # Do not allow more than that many jobs in a single run by default.
     # To disable this check use 0.
     job_threshold: 500
diff --git a/requirements.txt b/requirements.txt
@@ -203,6 +203,11 @@ zope-interface==6.1
 openstacksdk==4.5.0
     # via teuthology (pyproject.toml)
 python-openstackclient>=6.0.0
+    # via teuthology (pyproject.toml)
+oauthlib==3.3.1
+    # via teuthology (pyproject.toml)
+requests-oauthlib==2.0.0
+    # via teuthology (pyproject.toml)
 # The following packages are considered to be unsafe in a requirements file:
 # pip
 # setuptools
diff --git a/setup.cfg b/setup.cfg
@@ -45,6 +45,8 @@ install_requires =
     ndg-httpsclient
     netaddr
     openstacksdk # teuthology-openstack dependencies
+    oauthlib
+    requests-oauthlib
     paramiko
     pexpect
     pip-tools
diff --git a/teuthology/__init__.py b/teuthology/__init__.py
@@ -60,6 +60,11 @@
 # We also don't need the "Converted retries value" messages
 logging.getLogger('urllib3.util.retry').setLevel(
     logging.WARN)
+# Avoid verbose logging for requests_oauthlib also
+logging.getLogger('requests_oauthlib').setLevel(
+    logging.WARN)
+# Suppresses the underlying oauthlib library
+logging.getLogger('oauthlib.oauth1').setLevel(logging.WARN)
 
 logging.basicConfig(
     level=logging.INFO,
diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py
@@ -503,6 +503,9 @@ def stop_node(name: str, status: Union[dict, None]):
     elif status['machine_type'] in provision.pelagos.get_types():
         provision.pelagos.park_node(name)
         return
+    elif status['machine_type'] in provision.maas.get_types():
+        provision.maas.MAAS(name).release()
+        return
     elif remote_.is_container:
         remote_.run(
             args=['sudo', '/testnode_stop.sh'],
diff --git a/teuthology/maas/user_data/maas-centos-8-user-data.txt b/teuthology/maas/user_data/maas-centos-8-user-data.txt
@@ -0,0 +1,2 @@
+#cloud-config
+disable_root: false
diff --git a/teuthology/maas/user_data/maas-ubuntu-20.04-user-data.txt b/teuthology/maas/user_data/maas-ubuntu-20.04-user-data.txt
@@ -0,0 +1,2 @@
+#cloud-config
+disable_root: false
diff --git a/teuthology/maas/user_data/maas-ubuntu-22.04-user-data.txt b/teuthology/maas/user_data/maas-ubuntu-22.04-user-data.txt
@@ -0,0 +1,2 @@
+#cloud-config
+disable_root: false
diff --git a/teuthology/maas/user_data/maas-ubuntu-24.04-user-data.txt b/teuthology/maas/user_data/maas-ubuntu-24.04-user-data.txt
@@ -0,0 +1,2 @@
+#cloud-config
+disable_root: false
diff --git a/teuthology/maas/user_data/maas-ubuntu-25.04-user-data.txt b/teuthology/maas/user_data/maas-ubuntu-25.04-user-data.txt
@@ -0,0 +1,2 @@
+#cloud-config
+disable_root: false
diff --git a/teuthology/maas/user_data/maas-ubuntu-25.10-user-data.txt b/teuthology/maas/user_data/maas-ubuntu-25.10-user-data.txt
@@ -0,0 +1,2 @@
+#cloud-config
+disable_root: false
diff --git a/teuthology/provision/__init__.py b/teuthology/provision/__init__.py
@@ -8,6 +8,7 @@
 from teuthology.provision import cloud
 from teuthology.provision import downburst
 from teuthology.provision import fog
+from teuthology.provision import maas
 from teuthology.provision import openstack
 from teuthology.provision import pelagos
 
@@ -20,7 +21,7 @@ def _logfile(shortname: str, archive_path: str = ""):
 
 
 def get_reimage_types():
-    return pelagos.get_types() + fog.get_types()
+    return pelagos.get_types() + fog.get_types() + maas.get_types()
 
 
 def reimage(ctx, machine_name, machine_type):
@@ -29,12 +30,17 @@ def reimage(ctx, machine_name, machine_type):
 
     pelagos_types = pelagos.get_types()
     fog_types = fog.get_types()
-    if machine_type in pelagos_types and machine_type in fog_types:
+    maas_types = maas.get_types()
+    if (machine_type in pelagos_types and
+        machine_type in fog_types and
+        machine_type in maas_types):
         raise Exception('machine_type can be used with one provisioner only')
     elif machine_type in pelagos_types:
         obj = pelagos.Pelagos(machine_name, os_type, os_version)
     elif machine_type in fog_types:
         obj = fog.FOG(machine_name, os_type, os_version)
+    elif machine_type in maas_types:
+        obj = maas.MAAS(machine_name, os_type, os_version)
     else:
         raise Exception("The machine_type '%s' is not known to any "
                         "of configured provisioners" % machine_type)
diff --git a/teuthology/provision/maas.py b/teuthology/provision/maas.py
diff --git a/teuthology/provision/test/test_maas.py b/teuthology/provision/test/test_maas.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#cloud-config`
	`2`	`+disable_root: false`