diff --git a/.github/assets/testing/edge.yml b/.github/assets/testing/edge.yml index 2ae5172a6..5d2c3bca8 100644 --- a/.github/assets/testing/edge.yml +++ b/.github/assets/testing/edge.yml @@ -39,9 +39,9 @@ core: epa-orchestrator: channel: 2026.1/edge microceph: - channel: squid/edge + channel: tentacle/edge config: - snap-channel: squid/edge + snap-channel: tentacle/edge microovn: channel: 26.03/edge sunbeam-ovn-proxy: diff --git a/.github/workflows/test-snap.yml b/.github/workflows/test-snap.yml index 9469287cf..f44ec3558 100644 --- a/.github/workflows/test-snap.yml +++ b/.github/workflows/test-snap.yml @@ -21,12 +21,12 @@ on: microceph-charm-channel: description: Specify microceph charms channel required: true - default: squid/beta + default: tentacle/beta type: string microceph-snap-channel: description: Specify microceph snap channel required: true - default: squid/beta + default: tentacle/beta type: string rabbitmq-charm-channel: description: Specify rabbitmq charms channel diff --git a/cloud/etc/deploy-microceph/variables.tf b/cloud/etc/deploy-microceph/variables.tf index 98fc1abf6..c85b54d88 100644 --- a/cloud/etc/deploy-microceph/variables.tf +++ b/cloud/etc/deploy-microceph/variables.tf @@ -4,7 +4,7 @@ variable "charm_microceph_channel" { description = "Operator channel for microceph deployment" type = string - default = "squid/stable" + default = "tentacle/stable" } variable "charm_microceph_revision" { @@ -21,7 +21,7 @@ variable "charm_microceph_config" { variable "microceph_channel" { description = "K8S channel to deploy, not the operator channel" - default = "squid/stable" + default = "tentacle/stable" } variable "machine_ids" { diff --git a/manifests/2026.1/beta.yml b/manifests/2026.1/beta.yml index 4d7ebcd79..b0fdead57 100644 --- a/manifests/2026.1/beta.yml +++ b/manifests/2026.1/beta.yml @@ -32,9 +32,9 @@ core: sunbeam-machine: channel: 2026.1/beta microceph: - channel: squid/stable + channel: tentacle/stable config: - snap-channel: squid/stable + snap-channel: tentacle/stable microovn: channel: 26.03/stable openstack-network-agents: diff --git a/manifests/2026.1/candidate.yml b/manifests/2026.1/candidate.yml index 392b4de28..dd68def41 100644 --- a/manifests/2026.1/candidate.yml +++ b/manifests/2026.1/candidate.yml @@ -32,9 +32,9 @@ core: sunbeam-machine: channel: 2026.1/candidate microceph: - channel: squid/stable + channel: tentacle/stable config: - snap-channel: squid/stable + snap-channel: tentacle/stable microovn: channel: 26.03/stable openstack-network-agents: diff --git a/manifests/2026.1/edge.yml b/manifests/2026.1/edge.yml index 051972457..3b786c864 100644 --- a/manifests/2026.1/edge.yml +++ b/manifests/2026.1/edge.yml @@ -34,9 +34,9 @@ core: epa-orchestrator: channel: 2026.1/edge microceph: - channel: squid/stable + channel: tentacle/stable config: - snap-channel: squid/stable + snap-channel: tentacle/stable microovn: channel: 26.03/stable openstack-network-agents: diff --git a/manifests/2026.1/stable.yml b/manifests/2026.1/stable.yml index 1fb54bc31..2cfe57aa0 100644 --- a/manifests/2026.1/stable.yml +++ b/manifests/2026.1/stable.yml @@ -34,9 +34,9 @@ core: epa-orchestrator: channel: 2026.1/stable microceph: - channel: squid/stable + channel: tentacle/stable config: - snap-channel: squid/stable + snap-channel: tentacle/stable microovn: channel: 26.03/stable openstack-network-agents: diff --git a/sunbeam-python/sunbeam/versions.py b/sunbeam-python/sunbeam/versions.py index 32b55e4d7..7fa1eb779 100644 --- a/sunbeam-python/sunbeam/versions.py +++ b/sunbeam-python/sunbeam/versions.py @@ -25,7 +25,7 @@ def determine_version() -> str: OPENSTACK_CHANNEL = f"{determine_version()}/stable" RABBITMQ_CHANNEL = "3.12/stable" TRAEFIK_CHANNEL = "latest/stable" -MICROCEPH_CHANNEL = "squid/stable" +MICROCEPH_CHANNEL = "tentacle/stable" MICROOVN_CHANNEL = "26.03/stable" ROLE_DISTRIBUTOR_CHANNEL = "latest/stable" MYSQL_CHANNEL = "8.0/stable"