Migrate charm to charmhub latest/edge track

Change-Id: If6aa71b06752f45a0a2eb44d7335e4ba5e91f1f2

charmcraft.yaml

@@ -0,0 +1,13 @@
+type: charm
+
+parts:
+  charm:
+    source: src/
+    plugin: reactive
+    build-snaps: [charm]
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64

metadata.yaml

@@ -0,0 +1 @@
+src/metadata.yaml

osci.yaml

@@ -1,11 +1,9 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
-      - charm-yoga-functional-jobs
+      - charm-unit-jobs-py39
       - charm-xena-functional-jobs
-      - charm-wallaby-functional-jobs
+      - charm-yoga-functional-jobs
-      - charm-victoria-functional-jobs
-      - charm-ussuri-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: neutron-api-plugin-ironic

src/metadata.yaml

@@ -8,10 +8,7 @@ tags:
 - networking
 subordinate: true
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 provides:
   neutron-plugin-api-subordinate:

src/tests/bundles/bionic-train.yaml

@@ -1,250 +0,0 @@
-options:
-  source: &source cloud:bionic-train/proposed
-series: bionic
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - mysql:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - mysql:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - mysql:shared-db
-- - placement
-  - mysql
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    constraints: mem=4G
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      performance-schema: true
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-  hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-  ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-  ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1

src/tests/bundles/bionic-ussuri.yaml

@@ -1,250 +0,0 @@
-options:
-  source: &source cloud:bionic-ussuri/proposed
-series: bionic
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - mysql:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - mysql:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - mysql:shared-db
-- - placement
-  - mysql
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - vault:shared-db
-  - mysql:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    constraints: mem=4G
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      performance-schema: true
-  hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-  ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-  ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1

src/tests/bundles/focal-ussuri.yaml

@@ -1,284 +0,0 @@
-options:
-  source: &source distro
-series: focal
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    options:
-      source: *source
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-  hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-  ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-  ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1

src/tests/bundles/focal-victoria.yaml

@@ -1,284 +0,0 @@
-options:
-  source: &source cloud:focal-victoria/proposed
-series: focal
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    options:
-      source: *source
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-  hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-  ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-  ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1

src/tests/bundles/focal-wallaby.yaml

@@ -1,284 +0,0 @@
-options:
-  source: &source cloud:focal-wallaby
-series: focal
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    options:
-      source: *source
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-  hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-  ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-  ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1

src/tests/bundles/focal-xena.yaml

@@ -133,31 +133,41 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
+    channel: latest/edge
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,44 +177,50 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
+    channel: latest/edge
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
+    channel: latest/edge
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
+    channel: latest/edge
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
+    channel: latest/edge
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,8 +229,9 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,16 +239,18 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,28 +258,33 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
+    channel: latest/edge
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=2G
+    channel: latest/edge
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
   ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
+    charm: ch:ironic-api
     num_units: 3
     constraints: mem=2G
     options:
       openstack-origin: *source
+    channel: latest/edge
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: ch:ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,16 +293,19 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
+    channel: latest/edge
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
+    channel: latest/edge

src/tests/bundles/focal-yoga.yaml

@@ -133,31 +133,41 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
+    channel: latest/edge
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,44 +177,50 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
+    channel: latest/edge
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
+    channel: latest/edge
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
+    channel: latest/edge
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
+    channel: latest/edge
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,8 +229,9 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,16 +239,18 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,28 +258,33 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
+    channel: latest/edge
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=2G
+    channel: latest/edge
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
   ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
+    charm: ch:ironic-api
     num_units: 3
     constraints: mem=2G
     options:
       openstack-origin: *source
+    channel: latest/edge
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: ch:ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,16 +293,19 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
+    channel: latest/edge
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
+    channel: latest/edge

src/tests/bundles/hirsute-wallaby.yaml

@@ -1,284 +0,0 @@
-options:
-  source: &source distro
-series: hirsute
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:neutron-plugin-api
-  - neutron-api:neutron-plugin-api
-- - glance:shared-db
-  - glance-mysql-router:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    options:
-      source: *source
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-  hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
-    num_units: 0
-  ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-  ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1

src/tests/bundles/impish-xena.yaml

@@ -133,31 +133,41 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
+    channel: latest/edge
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,44 +177,50 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
+    channel: latest/edge
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
+    channel: latest/edge
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
+    channel: latest/edge
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
+    channel: latest/edge
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,8 +229,9 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,16 +239,18 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,28 +258,33 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
+    channel: latest/edge
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=2G
+    channel: latest/edge
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
   ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
+    charm: ch:ironic-api
     num_units: 3
     constraints: mem=2G
     options:
       openstack-origin: *source
+    channel: latest/edge
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: ch:ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,16 +293,19 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
+    channel: latest/edge
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
+    channel: latest/edge

src/tests/bundles/jammy-yoga.yaml

@@ -133,31 +133,41 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
+    channel: latest/edge
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,44 +177,50 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
+    channel: latest/edge
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
+    channel: latest/edge
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
+    channel: latest/edge
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
+    channel: latest/edge
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,8 +229,9 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
+    channel: latest/edge
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,16 +239,18 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,28 +258,33 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
+    channel: latest/edge
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
+    channel: latest/edge
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     constraints: mem=2G
+    channel: latest/edge
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
   ironic-api:
-    charm: cs:~openstack-charmers-next/ironic-api
+    charm: ch:ironic-api
     num_units: 3
     constraints: mem=2G
     options:
       openstack-origin: *source
+    channel: latest/edge
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: ch:ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,16 +293,19 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
+    channel: latest/edge
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
+    channel: latest/edge
   neutron-ironic-agent:
     charm: ../../../neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
+    channel: latest/edge

src/tests/tests.yaml

@@ -4,21 +4,15 @@
 charm_name: ironic-api
 
 gate_bundles:
-- bionic-ussuri
-- focal-ussuri
-- focal-victoria
-- focal-wallaby
 - focal-xena
-- hirsute-wallaby
 - impish-xena
 
 dev_bundles:
-- bionic-train
 - focal-yoga
 - jammy-yoga
 
 smoke_bundles:
-- focal-ussuri
+- focal-xena
 
 target_deploy_status:
   vault:
@@ -49,6 +43,5 @@ tests:
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga