Merge pull request #203 from stackhpc/upstream/master-2025-05-26

Synchronise master with upstream

Author: priteau

doc/source/install/index.rst

@@ -2,7 +2,6 @@
 Magnum Installation Guide
 =========================
 
-
 .. toctree::
    :maxdepth: 2
 
@@ -22,4 +21,3 @@ configuration.
 
 This chapter assumes a working setup of OpenStack following `OpenStack
 Installation Tutorial <https://docs.openstack.org/#install-guides>`_.
-

doc/source/install/install-guide-from-source.rst

@@ -47,14 +47,6 @@ Install and configure components
                          libxml2-devel libxslt-devel postgresql-devel git \
                          libffi-devel gettext gcc
 
-      * openSUSE Leap 42.1
-
-        .. code-block:: console
-
-           # zypper install git libffi-devel libmysqlclient-devel \
-                            libopenssl-devel libxml2-devel libxslt-devel \
-                            postgresql-devel python-devel gettext-runtime gcc
-
    b. Create magnum user and necessary directories:
 
       * Create user:
@@ -179,8 +171,7 @@ Finalize installation
 
 #. Create init scripts and services:
 
-   * Ubuntu 16.04 or higher, Fedora 21 or higher/RHEL 7/CentOS 7 or openSUSE
-     Leap 42.1:
+   * Ubuntu 16.04 or higher, Fedora 21 or higher/RHEL 7/CentOS 7:
 
      .. code-block:: console
 
@@ -192,8 +183,7 @@ Finalize installation
 
 #. Start magnum-api and magnum-conductor:
 
-   * Ubuntu 16.04 or higher, Fedora 21 or higher/RHEL 7/CentOS 7 or openSUSE
-     Leap 42.1:
+   * Ubuntu 16.04 or higher, Fedora 21 or higher/RHEL 7/CentOS 7:
 
      .. code-block:: console
 
@@ -207,8 +197,7 @@ Finalize installation
 
 #. Verify that magnum-api and magnum-conductor services are running:
 
-   * Ubuntu 16.04 or higher, Fedora 21 or higher/RHEL 7/CentOS 7 or openSUSE
-     Leap 42.1:
+   * Ubuntu 16.04 or higher, Fedora 21 or higher/RHEL 7/CentOS 7:
 
      .. code-block:: console
 
@@ -242,13 +231,6 @@ Install the command-line client
         # apt install python-dev libssl-dev python-virtualenv \
                       libffi-dev git gcc
 
-   * openSUSE Leap 42.1
-
-     .. code-block:: console
-
-        # zypper install python-devel libopenssl-devel python-virtualenv \
-                         libffi-devel git gcc
-
 #. Install the client in a virtual environment:
 
    .. code-block:: console

doc/source/install/install-obs.rst

@@ -49,7 +49,6 @@ Optionally, you can install the following components:
    :maxdepth: 2
 
    install-debian-manual.rst
-   install-obs.rst
    install-rdo.rst
    install-ubuntu.rst
    install-guide-from-source.rst

doc/source/install/install.rst

@@ -429,13 +429,16 @@ def post(self, cluster_template):
                                   do_raise=False):
                 raise exception.ClusterTemplatePublishDenied()
 
+        # explicitly define labels as empty dict if not defined
+        cluster_template_dict.setdefault("labels", {})
+
         # check root volume size
-        boot_volume_size = cluster_template.labels.get(
+        boot_volume_size = cluster_template_dict['labels'].get(
             'boot_volume_size', CONF.cinder.default_boot_volume_size)
         attr_validator.validate_flavor_root_volume_size(
-            cli, cluster_template.flavor_id, boot_volume_size)
+            cli, cluster_template_dict['flavor_id'], boot_volume_size)
         attr_validator.validate_flavor_root_volume_size(
-            cli, cluster_template.master_flavor_id, boot_volume_size)
+            cli, cluster_template_dict['master_flavor_id'], boot_volume_size)
 
         if (cluster_template.docker_storage_driver in ('devicemapper',
                                                        'overlay')):

magnum/api/controllers/v1/cluster_template.py

@@ -67,7 +67,7 @@ def __init__(self, ctx, cluster):
         self.cluster = cluster
 
     def update_status(self):
-        LOG.debug("Updating status for cluster %s", self.cluster.id)
+        LOG.debug("Updating status for cluster %s", self.cluster.uuid)
         # get the driver for the cluster
         cdriver = driver.Driver.get_driver_for_cluster(self.ctx, self.cluster)
         # ask the driver to sync status
@@ -85,7 +85,7 @@ def update_status(self):
                 raise
 
         LOG.debug("Status for cluster %s updated to %s (%s)",
-                  self.cluster.id, self.cluster.status,
+                  self.cluster.uuid, self.cluster.status,
                   self.cluster.status_reason)
         # status update notifications
         if self.cluster.status.endswith("_COMPLETE"):
@@ -144,10 +144,10 @@ def _update_health_status(self):
             self.cluster.save()
 
     def update_health_status(self):
-        LOG.debug("Updating health status for cluster %s", self.cluster.id)
+        LOG.debug("Updating health status for cluster %s", self.cluster.uuid)
         self._update_health_status()
         LOG.debug("Status for cluster %s updated to %s (%s)",
-                  self.cluster.id, self.cluster.health_status,
+                  self.cluster.uuid, self.cluster.health_status,
                   self.cluster.health_status_reason)
         # TODO(flwang): Health status update notifications?
         # end the "loop"

magnum/service/periodic.py

@@ -783,6 +783,21 @@ def test_create_cluster_template_with_labels(self, mock_image_data):
             cc_mock.assert_called_once_with(mock.ANY)
             self.assertNotIn('id', cc_mock.call_args[0][0])
 
+    @mock.patch('magnum.api.attr_validator.validate_image')
+    def test_create_cluster_template_without_labels(self, mock_image_data):
+        with mock.patch.object(
+                self.dbapi, 'create_cluster_template',
+                wraps=self.dbapi.create_cluster_template) as cc_mock:
+            mock_image_data.return_value = {'name': 'mock_name',
+                                            'os_distro': 'fedora-coreos'}
+            bdict = apiutils.cluster_template_post_data()
+            bdict.pop("labels")
+            response = self.post_json('/clustertemplates', bdict)
+            self.assertEqual(dict(),
+                             response.json['labels'])
+            cc_mock.assert_called_once_with(mock.ANY)
+            self.assertNotIn('id', cc_mock.call_args[0][0])
+
     @mock.patch('magnum.api.attr_validator.validate_image')
     def test_create_cluster_template_with_docker_volume_size(self,
                                                              mock_image_data):

magnum/tests/unit/api/controllers/v1/test_cluster_template.py

@@ -0,0 +1,6 @@
+---
+other:
+  - |
+    When debug logging is enabled, periodic update logging will
+    now output Cluster UUID instead of database ID to better
+    identify the object being updated.