Migrate charm to charmhub latest/edge track

Change-Id: I6908767be9c8f8897b95dcae28b9d5f75ab916d6

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,16 +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
-      - charm-stein-functional-jobs
-    check:
-      jobs:
-        - bionic-queens-swift-v2
-        - bionic-queens-swift-v3
     vars:
       needs_charm_build: true
       charm_build_name: cinder-backup-swift-proxy

src/metadata.yaml

@@ -8,10 +8,7 @@ description: |
 tags:
 - misc
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 subordinate: true
 provides:

src/tests/bundles/bionic-queens-swift-v2.yaml

@@ -1,140 +0,0 @@
-series: bionic
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - 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-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder
-  - cinder-backup-swift-proxy
-- - ceph-mon:client
-  - nova-compute:ceph
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - cinder:shared-db
-  - mysql:shared-db
-- - ceph-mon:client
-  - cinder-ceph:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-osd:mon
-  - ceph-mon:osd
-
-# external swift service
-- - swift-keystone:shared-db
-  - swift-mysql:shared-db
-- - swift-proxy:identity-service
-  - swift-keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage:swift-storage
-
-applications:
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      glance-api-version: 2
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-
-# external swift
-  swift-keystone:
-    series: xenial
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      preferred-api-version: 3
-  swift-mysql:
-    series: xenial
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  swift-proxy:
-    series: xenial
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      zone-assignment: manual
-      replicas: 1
-  swift-storage:
-    series: xenial
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-

src/tests/bundles/bionic-queens-swift-v3.yaml

@@ -1,135 +0,0 @@
-series: bionic
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - 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-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder
-  - cinder-backup-swift-proxy
-- - ceph-mon:client
-  - nova-compute:ceph
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - cinder:shared-db
-  - mysql:shared-db
-- - ceph-mon:client
-  - cinder-ceph:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-osd:mon
-  - ceph-mon:osd
-
-# external swift service
-- - swift-keystone:shared-db
-  - swift-mysql:shared-db
-- - swift-proxy:identity-service
-  - swift-keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage:swift-storage
-
-applications:
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      glance-api-version: 2
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-
-# external swift
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      preferred-api-version: 3
-  swift-mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      zone-assignment: manual
-      replicas: 1
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'

src/tests/bundles/bionic-stein.yaml

@@ -1,156 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-stein
-
-series: bionic
-
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - mysql:shared-db
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - 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-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder
-  - cinder-backup-swift-proxy
-- - ceph-mon:client
-  - nova-compute:ceph
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - cinder:shared-db
-  - mysql:shared-db
-- - ceph-mon:client
-  - cinder-ceph:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-osd:mon
-  - ceph-mon:osd
-
-# external swift service
-- - swift-keystone:shared-db
-  - swift-mysql:shared-db
-- - swift-proxy:identity-service
-  - swift-keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage:swift-storage
-
-applications:
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-
-# external swift
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-  swift-mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'

src/tests/bundles/bionic-ussuri.yaml

@@ -1,273 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-ussuri
-
-series: bionic
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-    constraints: mem=3072M
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-    constraints: mem=3072M
-  '16':
-  '17':
-
-applications:
-
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-    to:
-      - '0'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '1'
-      - '2'
-      - '3'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '7'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '8'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '11'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '13'
-
-# external swift
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '14'
-
-  swift-mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-    to:
-      - '15'
-
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '16'
-
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '17'
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'mysql:shared-db'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'mysql:shared-db'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'mysql:shared-db'
-
-  - - 'placement:shared-db'
-    - 'mysql:shared-db'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - '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-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'mysql:shared-db'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-mysql:shared-db'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/focal-ussuri.yaml

@@ -1,307 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: focal
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-
-
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - '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-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/focal-victoria.yaml

@@ -1,307 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-series: focal
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-
-
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - '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-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/focal-wallaby.yaml

@@ -1,307 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-wallaby
-
-series: focal
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-
-
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - '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-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/focal-xena.yaml

@@ -38,18 +38,23 @@ machines:
 applications:
 
   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
   nova-cloud-controller-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
   placement-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
     options:
       source: *openstack-origin
@@ -57,9 +62,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,9 +74,10 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -81,9 +88,10 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: None
@@ -91,10 +99,12 @@ applications:
       glance-api-version: 2
     to:
       - '12'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     num_units: 0
+    channel: latest/edge
 
   cinder-backup-swift-proxy:
     charm: cinder-backup-swift-proxy
@@ -108,60 +118,67 @@ applications:
       project-name: admin
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '17'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
      - '18'
+    channel: latest/edge
 
 # external swift
   swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -169,9 +186,10 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -179,10 +197,11 @@ applications:
       preferred-api-version: 3
     to:
       - '19'
+    channel: latest/edge
 
 
   swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
+    charm: ch:swift-proxy
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -190,9 +209,10 @@ applications:
       replicas: 1
     to:
       - '20'
+    channel: latest/edge
 
   swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
+    charm: ch:swift-storage
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -201,6 +221,7 @@ applications:
       block-devices: 'cinder,10G'
     to:
       - '21'
+    channel: latest/edge
 
 
 relations:

src/tests/bundles/focal-yoga.yaml

@@ -38,18 +38,23 @@ machines:
 applications:
 
   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
   nova-cloud-controller-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
   placement-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
     options:
       source: *openstack-origin
@@ -57,9 +62,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,9 +74,10 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -81,9 +88,10 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: None
@@ -91,10 +99,12 @@ applications:
       glance-api-version: 2
     to:
       - '12'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     num_units: 0
+    channel: latest/edge
 
   cinder-backup-swift-proxy:
     charm: cinder-backup-swift-proxy
@@ -108,60 +118,67 @@ applications:
       project-name: admin
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '17'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
      - '18'
+    channel: latest/edge
 
 # external swift
   swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -169,9 +186,10 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -179,10 +197,11 @@ applications:
       preferred-api-version: 3
     to:
       - '19'
+    channel: latest/edge
 
 
   swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
+    charm: ch:swift-proxy
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -190,9 +209,10 @@ applications:
       replicas: 1
     to:
       - '20'
+    channel: latest/edge
 
   swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
+    charm: ch:swift-storage
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -201,6 +221,7 @@ applications:
       block-devices: 'cinder,10G'
     to:
       - '21'
+    channel: latest/edge
 
 
 relations:

src/tests/bundles/hirsute-wallaby.yaml

@@ -1,307 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: hirsute
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-    constraints: mem=3072M
-  '4':
-    constraints: mem=3072M
-  '5':
-    constraints: mem=3072M
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-  '18':
-  '19':
-  '20':
-  '21':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    to:
-      - '6'
-      - '7'
-      - '8'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '9'
-      - '10'
-      - '11'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: None
-      openstack-origin: *openstack-origin
-      glance-api-version: 2
-    to:
-      - '12'
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    num_units: 0
-
-  cinder-backup-swift-proxy:
-    charm: cinder-backup-swift-proxy
-    num_units: 0
-    options:
-      auth-version: 3
-      swift-user: admin
-      swift-key: openstack
-      user-domain: admin_domain
-      project-domain: admin_domain
-      project-name: admin
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '13'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '16'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '17'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    constraints: mem=1G
-    options:
-      openstack-origin: *openstack-origin
-    to:
-     - '18'
-
-# external swift
-  swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-
-  swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-      preferred-api-version: 3
-    to:
-      - '19'
-
-
-  swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone-assignment: manual
-      replicas: 1
-    to:
-      - '20'
-
-  swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: 'cinder,10G'
-    to:
-      - '21'
-
-
-relations:
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - '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-ceph:storage-backend'
-    - 'cinder:storage-backend'
-
-  - - 'cinder'
-    - 'cinder-backup-swift-proxy'
-
-  - - 'ceph-mon:client'
-    - 'nova-compute:ceph'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-mon:client'
-    - 'cinder-ceph:ceph'
-
-  - - 'ceph-mon:client'
-    - 'glance:ceph'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-# external swift service
-  - - 'swift-keystone:shared-db'
-    - 'swift-keystone-mysql-router:shared-db'
-  - - 'swift-keystone-mysql-router:db-router'
-    - 'swift-mysql-innodb-cluster:db-router'
-
-  - - 'swift-proxy:identity-service'
-    - 'swift-keystone:identity-service'
-
-  - - 'swift-proxy:swift-storage'
-    - 'swift-storage:swift-storage'
-

src/tests/bundles/impish-xena.yaml

@@ -38,18 +38,23 @@ machines:
 applications:
 
   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
   nova-cloud-controller-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
   placement-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
     options:
       source: *openstack-origin
@@ -57,9 +62,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,9 +74,10 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -81,9 +88,10 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: None
@@ -91,10 +99,12 @@ applications:
       glance-api-version: 2
     to:
       - '12'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     num_units: 0
+    channel: latest/edge
 
   cinder-backup-swift-proxy:
     charm: cinder-backup-swift-proxy
@@ -108,60 +118,67 @@ applications:
       project-name: admin
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '17'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
      - '18'
+    channel: latest/edge
 
 # external swift
   swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -169,9 +186,10 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -179,10 +197,11 @@ applications:
       preferred-api-version: 3
     to:
       - '19'
+    channel: latest/edge
 
 
   swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
+    charm: ch:swift-proxy
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -190,9 +209,10 @@ applications:
       replicas: 1
     to:
       - '20'
+    channel: latest/edge
 
   swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
+    charm: ch:swift-storage
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -201,6 +221,7 @@ applications:
       block-devices: 'cinder,10G'
     to:
       - '21'
+    channel: latest/edge
 
 
 relations:

src/tests/bundles/jammy-yoga.yaml

@@ -38,18 +38,23 @@ machines:
 applications:
 
   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
   nova-cloud-controller-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
   placement-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
     options:
       source: *openstack-origin
@@ -57,9 +62,10 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -68,9 +74,10 @@ applications:
       - '6'
       - '7'
       - '8'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -81,9 +88,10 @@ applications:
       - '9'
       - '10'
       - '11'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: None
@@ -91,10 +99,12 @@ applications:
       glance-api-version: 2
     to:
       - '12'
+    channel: latest/edge
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     num_units: 0
+    channel: latest/edge
 
   cinder-backup-swift-proxy:
     charm: cinder-backup-swift-proxy
@@ -108,60 +118,67 @@ applications:
       project-name: admin
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '13'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '14'
+    channel: latest/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '16'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '17'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=1G
     options:
       openstack-origin: *openstack-origin
     to:
      - '18'
+    channel: latest/edge
 
 # external swift
   swift-keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   swift-mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -169,9 +186,10 @@ applications:
       - '3'
       - '4'
       - '5'
+    channel: latest/edge
 
   swift-keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -179,10 +197,11 @@ applications:
       preferred-api-version: 3
     to:
       - '19'
+    channel: latest/edge
 
 
   swift-proxy:
-    charm: cs:~openstack-charmers-next/swift-proxy
+    charm: ch:swift-proxy
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -190,9 +209,10 @@ applications:
       replicas: 1
     to:
       - '20'
+    channel: latest/edge
 
   swift-storage:
-    charm: cs:~openstack-charmers-next/swift-storage
+    charm: ch:swift-storage
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -201,6 +221,7 @@ applications:
       block-devices: 'cinder,10G'
     to:
       - '21'
+    channel: latest/edge
 
 
 relations:

src/tests/tests.yaml

@@ -1,25 +1,17 @@
 charm_name: cinder-backup-swift-proxy
 gate_bundles:
-  - bionic-queens-swift-v2
-  - bionic-queens-swift-v3
-  - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
   - focal-xena
-  - hirsute-wallaby
   - impish-xena
 dev_bundles:
   - focal-yoga
   - jammy-yoga
 smoke_bundles:
-  - bionic-queens-swift-v2
+  - focal-xena
-  - focal-ussuri
 configure:
   - zaza.openstack.charm_tests.cinder_backup_swift_proxy.setup.configure_cinder_backup
 tests:
   - zaza.openstack.charm_tests.cinder_backup_swift_proxy.tests.CinderBackupSwiftTest
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga