Migrate charm to charmhub latest/edge track

Change-Id: I409d37bff9dde8bd94c2512e57170df6024f9b8f

charmcraft.yaml

@@ -0,0 +1,27 @@
+type: charm
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - actions.yaml
+      - config.yaml
+      - copyright
+      - hardening.yaml
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64

metadata.yaml

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

osci.yaml

@@ -1,10 +1,6 @@
 - 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
-      - charm-queens-functional-jobs

tests/bundles/bionic-queens.yaml

@@ -1,77 +0,0 @@
-series: bionic
-relations:
-- - cinder-backup:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder:backup-backend
-  - cinder-backup:backup-backend
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - glance:image-service
-  - nova-compute:image-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-  cinder-backup:
-    charm: ../../../cinder-backup
-    series: bionic
-    options:
-      ceph-osd-replication-count: 3
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1

tests/bundles/bionic-rocky.yaml

@@ -1,83 +0,0 @@
-series: bionic
-relations:
-- - cinder-backup:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder:backup-backend
-  - cinder-backup:backup-backend
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - glance:image-service
-  - nova-compute:image-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      source: cloud:bionic-rocky
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-      source: cloud:bionic-rocky
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: cloud:bionic-rocky
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:bionic-rocky
-  cinder-backup:
-    charm: ../../../cinder-backup
-    series: bionic
-    options:
-      ceph-osd-replication-count: 3
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1

tests/bundles/bionic-stein.yaml

@@ -1,83 +0,0 @@
-series: bionic
-relations:
-- - cinder-backup:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder:backup-backend
-  - cinder-backup:backup-backend
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - glance:image-service
-  - nova-compute:image-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      source: cloud:bionic-stein
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-      source: cloud:bionic-stein
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: cloud:bionic-stein
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:bionic-stein
-  cinder-backup:
-    charm: ../../../cinder-backup
-    series: bionic
-    options:
-      ceph-osd-replication-count: 3
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1

tests/bundles/bionic-train.yaml

@@ -1,82 +0,0 @@
-series: bionic
-relations:
-- - cinder-backup:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder:backup-backend
-  - cinder-backup:backup-backend
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - glance:image-service
-  - nova-compute:image-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      source: cloud:bionic-train
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: cloud:bionic-train
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: cloud:bionic-train
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:bionic-train
-  cinder-backup:
-    charm: ../../../cinder-backup
-    series: bionic
-    options:
-      ceph-osd-replication-count: 3
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1

tests/bundles/bionic-ussuri.yaml

@@ -1,82 +0,0 @@
-series: bionic
-relations:
-- - cinder-backup:ceph
-  - ceph-mon:client
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder:backup-backend
-  - cinder-backup:backup-backend
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - glance:image-service
-  - nova-compute:image-service
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - nova-compute:ceph-access
-  - cinder-ceph:ceph-access
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      source: cloud:bionic-train
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: cloud:bionic-train
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: cloud:bionic-train
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:bionic-train
-  cinder-backup:
-    charm: ../../../cinder-backup
-    series: bionic
-    options:
-      ceph-osd-replication-count: 3
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1

tests/bundles/focal-ussuri.yaml

@@ -1,164 +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':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '4'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '5'
-      - '6'
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-
-  cinder-backup:
-    charm: ../../../cinder-backup
-    options:
-      ceph-osd-replication-count: 3
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-      - '12'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    to:
-      - '13'
-
-relations:
-
-  - - 'cinder-backup:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder:backup-backend'
-    - 'cinder-backup:backup-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:image-service'
-    - 'nova-compute:image-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'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'

tests/bundles/focal-victoria.yaml

@@ -1,164 +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':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '4'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '5'
-      - '6'
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-
-  cinder-backup:
-    charm: ../../../cinder-backup
-    options:
-      ceph-osd-replication-count: 3
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-      - '12'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    to:
-      - '13'
-
-relations:
-
-  - - 'cinder-backup:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder:backup-backend'
-    - 'cinder-backup:backup-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:image-service'
-    - 'nova-compute:image-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'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'

tests/bundles/focal-wallaby.yaml

@@ -1,164 +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':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '4'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '5'
-      - '6'
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-
-  cinder-backup:
-    charm: ../../../cinder-backup
-    options:
-      ceph-osd-replication-count: 3
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-      - '12'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    to:
-      - '13'
-
-relations:
-
-  - - 'cinder-backup:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder:backup-backend'
-    - 'cinder-backup:backup-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:image-service'
-    - 'nova-compute:image-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'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'

tests/bundles/focal-xena.yaml

@@ -27,14 +27,17 @@ machines:
 applications:
 
   keystone-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
   glance-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
@@ -42,23 +45,26 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '4'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
@@ -67,9 +73,10 @@ applications:
       - '5'
       - '6'
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -80,9 +87,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -90,6 +98,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '11'
+    channel: latest/edge
 
   cinder-backup:
     charm: ../../../cinder-backup
@@ -97,21 +106,24 @@ applications:
       ceph-osd-replication-count: 3
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     options:
       ceph-osd-replication-count: 3
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     to:
       - '12'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
 relations:
 

tests/bundles/focal-yoga.yaml

@@ -27,14 +27,17 @@ machines:
 applications:
 
   keystone-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
   glance-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
@@ -42,23 +45,26 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '4'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
@@ -67,9 +73,10 @@ applications:
       - '5'
       - '6'
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -80,9 +87,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -90,6 +98,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '11'
+    channel: latest/edge
 
   cinder-backup:
     charm: ../../../cinder-backup
@@ -97,21 +106,24 @@ applications:
       ceph-osd-replication-count: 3
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     options:
       ceph-osd-replication-count: 3
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     to:
       - '12'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
 relations:
 

tests/bundles/hirsute-wallaby.yaml

@@ -1,164 +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':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '4'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '5'
-      - '6'
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: *openstack-origin
-    to:
-      - '11'
-
-  cinder-backup:
-    charm: ../../../cinder-backup
-    options:
-      ceph-osd-replication-count: 3
-
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-    options:
-      ceph-osd-replication-count: 3
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-      - '12'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    to:
-      - '13'
-
-relations:
-
-  - - 'cinder-backup:ceph'
-    - 'ceph-mon:client'
-
-  - - 'cinder-ceph:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'cinder:storage-backend'
-    - 'cinder-ceph:storage-backend'
-
-  - - 'cinder:backup-backend'
-    - 'cinder-backup:backup-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:image-service'
-    - 'nova-compute:image-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'
-
-  - - 'nova-compute:ceph-access'
-    - 'cinder-ceph:ceph-access'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'

tests/bundles/impish-xena.yaml

@@ -27,14 +27,17 @@ machines:
 applications:
 
   keystone-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
   glance-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
@@ -42,23 +45,26 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '4'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
@@ -67,9 +73,10 @@ applications:
       - '5'
       - '6'
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -80,9 +87,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -90,6 +98,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '11'
+    channel: latest/edge
 
   cinder-backup:
     charm: ../../../cinder-backup
@@ -97,21 +106,24 @@ applications:
       ceph-osd-replication-count: 3
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     options:
       ceph-osd-replication-count: 3
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     to:
       - '12'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
 relations:
 

tests/bundles/jammy-yoga.yaml

@@ -27,14 +27,17 @@ machines:
 applications:
 
   keystone-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
   glance-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
@@ -42,23 +45,26 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '4'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
@@ -67,9 +73,10 @@ applications:
       - '5'
       - '6'
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -80,9 +87,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -90,6 +98,7 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '11'
+    channel: latest/edge
 
   cinder-backup:
     charm: ../../../cinder-backup
@@ -97,21 +106,24 @@ applications:
       ceph-osd-replication-count: 3
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: ch:cinder-ceph
     options:
       ceph-osd-replication-count: 3
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     to:
       - '12'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     to:
       - '13'
+    channel: latest/edge
 
 relations:
 

tests/tests.yaml

@@ -1,22 +1,13 @@
 charm_name: cinder-backup
 
 smoke_bundles:
-  - focal-ussuri
+  - focal-xena
 
 gate_bundles:
-  - bionic-queens
-  - bionic-stein
-  - bionic-ussuri
-  - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
   - focal-xena
-  - hirsute-wallaby
   - impish-xena
 
 dev_bundles:
-  - bionic-rocky
-  - bionic-train
   - focal-yoga
   - jammy-yoga
 
@@ -25,6 +16,5 @@ tests:
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga