Merge pull request #201 from hemanthnakkina/feat/2024.1

Updates for Caracal release
canonical · Apr 21, 2024 · a6d47e3 · a6d47e3
2 parents d03ab22 + 5e94446
commit a6d47e3
Show file tree

Hide file tree

Showing 9 changed files with 443 additions and 408 deletions.
diff --git a/cloud/etc/deploy-openstack-hypervisor/main.tf b/cloud/etc/deploy-openstack-hypervisor/main.tf
@@ -141,3 +141,16 @@ resource "juju_integration" "hypervisor-cinder-ceph" {
     offer_url = data.terraform_remote_state.openstack.outputs.cinder-ceph-offer-url
   }
 }
+
+resource "juju_integration" "hypervisor-nova-controller" {
+  model = var.machine_model
+
+  application {
+    name     = juju_application.openstack-hypervisor.name
+    endpoint = "nova-service"
+  }
+
+  application {
+    offer_url = data.terraform_remote_state.openstack.outputs.nova-offer-url
+  }
+}
diff --git a/cloud/etc/deploy-openstack-hypervisor/variables.tf b/cloud/etc/deploy-openstack-hypervisor/variables.tf
@@ -22,13 +22,13 @@ variable "machine_ids" {
 variable "snap_channel" {
   description = "Snap channel to deploy openstack-hypervisor snap from"
   type        = string
-  default     = "2023.2/stable"
+  default     = "2024.1/stable"
 }
 
 variable "charm_channel" {
   description = "Charm channel to deploy openstack-hypervisor charm from"
   type        = string
-  default     = "2023.2/stable"
+  default     = "2024.1/stable"
 }
 
 variable "charm_revision" {

diff --git a/cloud/etc/deploy-sunbeam-machine/variables.tf b/cloud/etc/deploy-sunbeam-machine/variables.tf
@@ -22,7 +22,7 @@ variable "machine_ids" {
 variable "charm_channel" {
   description = "Charm channel to deploy openstack-hypervisor charm from"
   type        = string
-  default     = "2023.2/stable"
+  default     = "2024.1/stable"
 }
 
 variable "charm_revision" {

diff --git a/manifests/candidate.yml b/manifests/candidate.yml
@@ -1,58 +1,58 @@
 software:
   charms:
     aodh-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     barbican-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     ceilometer-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     cinder-ceph-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     cinder-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     designate-bind-k8s:
       channel: 9/candidate
     designate-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     glance-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     gnocchi-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     heat-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     horizon-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     keystone-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     keystone-ldap-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     magnum-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     neutron-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     nova-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     octavia-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     openstack-exporter-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     openstack-hypervisor:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
       config:
-        snap-channel: 2023.2/candidate
+        snap-channel: 2024.1/candidate
     ovn-central-k8s:
-      channel: 23.09/candidate
+      channel: 24.03/candidate
     ovn-relay-k8s:
-      channel: 23.09/candidate
+      channel: 24.03/candidate
     placement-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     sunbeam-clusterd:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
       config:
-        snap-channel: 2023.2/candidate
+        snap-channel: 2024.1/candidate
     sunbeam-machine:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     tempest-k8s:
-      channel: 2023.2/candidate
+      channel: 2024.1/candidate
     microceph:
       channel: reef/candidate
diff --git a/manifests/edge.yml b/manifests/edge.yml
@@ -1,58 +1,58 @@
 software:
   charms:
     aodh-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     barbican-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     ceilometer-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     cinder-ceph-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     cinder-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     designate-bind-k8s:
       channel: 9/edge
     designate-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     glance-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     gnocchi-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     heat-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     horizon-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     keystone-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     keystone-ldap-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     magnum-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     neutron-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     nova-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     octavia-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     openstack-exporter-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     openstack-hypervisor:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
       config:
-        snap-channel: 2023.2/edge
+        snap-channel: 2024.1/edge
     ovn-central-k8s:
-      channel: 23.09/edge
+      channel: 24.03/edge
     ovn-relay-k8s:
-      channel: 23.09/edge
+      channel: 24.03/edge
     placement-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     sunbeam-clusterd:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
       config:
-        snap-channel: 2023.2/edge
+        snap-channel: 2024.1/edge
     sunbeam-machine:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     tempest-k8s:
-      channel: 2023.2/edge
+      channel: 2024.1/edge
     microceph:
       channel: reef/edge
diff --git a/sunbeam-python/sunbeam/jobs/manifest.py b/sunbeam-python/sunbeam/jobs/manifest.py
@@ -98,7 +98,7 @@ class TerraformManifest:
     source: Path = Field(description="Path to Terraform plan")
 
 
-@dataclass(config=dict(extra="allow"))
+@dataclass(config=dict(extra="allow", arbitrary_types_allowed=True))
 class SoftwareConfig:
     deployment: InitVar[Deployment]
     plugin_manager: InitVar[PluginManager]

diff --git a/sunbeam-python/sunbeam/versions.py b/sunbeam-python/sunbeam/versions.py
@@ -17,20 +17,20 @@
 SUPPORTED_RELEASE = "jammy"
 JUJU_CHANNEL = "3.4/stable"
 JUJU_BASE = "[email protected]"
-OPENSTACK_CHANNEL = "2023.2/stable"
-OVN_CHANNEL = "23.09/stable"
+OPENSTACK_CHANNEL = "2024.1/stable"
+OVN_CHANNEL = "24.03/stable"
 RABBITMQ_CHANNEL = "3.12/stable"
 TRAEFIK_CHANNEL = "1.0/stable"
 MICROCEPH_CHANNEL = "reef/candidate"
-SUNBEAM_MACHINE_CHANNEL = "2023.2/stable"
-SUNBEAM_CLUSTERD_CHANNEL = "2023.2/stable"
-SNAP_SUNBEAM_CLUSTERD_CHANNEL = "2023.2/stable"
+SUNBEAM_MACHINE_CHANNEL = "2024.1/stable"
+SUNBEAM_CLUSTERD_CHANNEL = "2024.1/stable"
+SNAP_SUNBEAM_CLUSTERD_CHANNEL = "2024.1/stable"
 MICROK8S_CHANNEL = "legacy/stable"
 MYSQL_CHANNEL = "8.0/stable"
 CERT_AUTH_CHANNEL = "latest/beta"
 BIND_CHANNEL = "9/stable"
 VAULT_CHANNEL = "latest/edge"  # Pinned to a specific revision in TF plans
-TEMPEST_CHANNEL = "2023.2/stable"
+TEMPEST_CHANNEL = "2024.1/stable"
 
 # List of charms with default channels
 OPENSTACK_CHARMS_K8S = {

diff --git a/sunbeam-python/tests/unit/sunbeam/jobs/test_manifest.py b/sunbeam-python/tests/unit/sunbeam/jobs/test_manifest.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from pathlib import Path
-from unittest.mock import Mock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import pytest
 import yaml
@@ -27,6 +27,8 @@
     ManifestItemNotFoundException,
 )
 from sunbeam.jobs.common import ResultType
+from sunbeam.jobs.deployment import Deployment
+from sunbeam.jobs.plugin import PluginManager
 from sunbeam.versions import OPENSTACK_CHANNEL, TERRAFORM_DIR_NAMES
 
 test_manifest = """
@@ -85,15 +87,16 @@
 
 @pytest.fixture()
 def deployment():
-    mock = Mock()
-    mock.name = "test_deployment"
-    mock.juju_controller.api_endpoints = ["ep1", "ep2"]
+    mock = Mock(Deployment)
+    mock.__setattr__("name", "test_deployment")
+    mock.__setattr__("juju_controller", MagicMock())
+    mock.__setattr__("juju_account", MagicMock())
     yield mock
 
 
 @pytest.fixture()
 def pluginmanager():
-    with patch("sunbeam.jobs.manifest.PluginManager") as p:
+    with patch("sunbeam.jobs.manifest.PluginManager", spec=PluginManager) as p:
         yield p