Migrate charm to charmhub latest/edge track

Change-Id: If50bf1a3448cf94bae69d8492dd3558306aafe0d

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,24 +1,15 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
     check:
       jobs:
-        - bionic-queens_manila
-        - ganesha-bionic-stein
-        - ganesha-bionic-ussuri
-        - ganesha-focal-ussuri
-        - ganesha-focal-victoria
         # Wallaby is currently broken because of a change in the default token
         # type requirements in manila's policy.json that the charm / tests need
         # to learn to handle
-        - ganesha-focal-wallaby:
+        - ganesha-focal-xena
-            voting: false
-        - ganesha-focal-xena:
-            voting: false
         - ganesha-focal-yoga:
             voting: false
-        - ganesha-hirsute-wallaby:
-            voting: false
         - ganesha-impish-xena:
             voting: false
         - ganesha-jammy-yoga:
@@ -27,83 +18,33 @@
       needs_charm_build: true
       charm_build_name: manila
 - job:
-    name: ganesha-focal-ussuri
+    name: ganesha-focal-xena
     parent: func-target
     dependencies:
       - osci-lint
-      - tox-py36
       - tox-py38
       - tox-py39
-    vars:
+      - charm-build
-      tox_extra_args: ganesha:focal-ussuri
-- job:
-    name: bionic-queens_manila
-    parent: bionic-queens
-    dependencies: &smoke-jobs
-      - ganesha-focal-ussuri
-- job:
-    name: ganesha-bionic-stein
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:bionic-stein
-- job:
-    name: ganesha-bionic-ussuri
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:bionic-ussuri
-- job:
-    name: ganesha-focal-victoria
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:focal-victoria
-- job:
-    name: ganesha-focal-wallaby
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:focal-wallaby
-- job:
-    name: ganesha-focal-xena
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:focal-xena
-- job:
-    name: ganesha-focal-wallaby
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:focal-wallaby
-- job:
-    name: ganesha-focal-xena
-    parent: func-target
-    dependencies: *smoke-jobs
     vars:
       tox_extra_args: ganesha:focal-xena
 - job:
     name: ganesha-focal-yoga
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - ganesha-focal-xena
     vars:
       tox_extra_args: ganesha:focal-yoga
-- job:
-    name: ganesha-hirsute-wallaby
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: ganesha:hirsute-wallaby
 - job:
     name: ganesha-impish-xena
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - ganesha-focal-xena
     vars:
       tox_extra_args: ganesha:impish-xena
 - job:
     name: ganesha-jammy-yoga
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - ganesha-focal-xena
     vars:
       tox_extra_args: ganesha:jammy-yoga

src/metadata.yaml

@@ -11,10 +11,7 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 subordinate: false
 requires:

src/tests/bundles/bionic-queens.yaml

@@ -1,37 +0,0 @@
-series: bionic
-services:
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    series: bionic
-    options:
-      default-share-backend: generic
-  manila-generic:
-    charm: cs:~openstack-charmers-next/manila-generic
-    options:
-      driver-handles-share-servers: False
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - manila:manila-plugin
-    - manila-generic
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - nrpe:nrpe-external-master
-    - manila:nrpe-external-master

src/tests/bundles/bionic-rocky.yaml

@@ -1,151 +0,0 @@
-series: bionic
-options:
-  source: &source cloud:bionic-rocky
-services:
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    series: bionic
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha
-  - - manila-ganesha
-    - percona-cluster
-  - - manila-ganesha
-    - rabbitmq-server
-  - - manila-ganesha
-    - keystone
-  - - manila
-    - manila-ganesha
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/bionic-stein.yaml

@@ -1,151 +0,0 @@
-series: bionic
-options:
-  source: &source cloud:bionic-stein
-services:
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    series: bionic
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha
-  - - manila-ganesha
-    - percona-cluster
-  - - manila-ganesha
-    - rabbitmq-server
-  - - manila-ganesha
-    - keystone
-  - - manila
-    - manila-ganesha
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/bionic-train.yaml

@@ -1,164 +0,0 @@
-series: bionic
-variables:
-  source: &source cloud:bionic-train
-services:
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    series: bionic
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 3
-    options:
-      openstack-origin: *source
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - ceph-mon
-    - ceph-osd
-  - - ceph-mon
-    - ceph-fs
-  - - ceph-mon
-    - manila-ganesha
-  - - manila-ganesha
-    - percona-cluster
-  - - manila-ganesha
-    - rabbitmq-server
-  - - manila-ganesha
-    - keystone
-  - - manila
-    - manila-ganesha
-  - - manila
-    - rabbitmq-server
-  - - manila
-    - keystone
-  - - keystone
-    - percona-cluster
-  - - manila
-    - percona-cluster
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'placement:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/bionic-ussuri.yaml

@@ -1,166 +0,0 @@
-series: bionic
-variables:
-  source: &source cloud:bionic-ussuri
-services:
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *source
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,10G'
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *source
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    series: bionic
-    options:
-      openstack-origin: *source
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *source
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *source
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *source
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *source
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *source
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-  - - 'ceph-mon'
-    - 'ceph-fs'
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-  - - 'manila-ganesha'
-    - 'percona-cluster'
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-  - - 'manila-ganesha'
-    - 'keystone'
-  - - 'manila'
-    - 'manila-ganesha'
-  - - 'manila'
-    - 'rabbitmq-server'
-  - - 'manila'
-    - 'keystone'
-  - - 'keystone'
-    - 'percona-cluster'
-  - - 'manila'
-    - 'percona-cluster'
-  - - 'neutron-api:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'placement:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/focal-ussuri.yaml

@@ -1,319 +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':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - '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-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/focal-victoria.yaml

@@ -1,319 +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':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - '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-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/focal-wallaby.yaml

@@ -1,319 +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':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - '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-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/focal-xena.yaml

@@ -40,22 +40,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-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
   glance-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
@@ -63,17 +70,19 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha:
     num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
+    charm: ch:manila-ganesha
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -81,9 +90,10 @@ services:
       - '4'
       - '5'
       - '6'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -93,15 +103,17 @@ services:
       - '7'
       - '8'
       - '9'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '10'
       - '11'
+    channel: latest/edge
 
   manila:
     charm: ../../../manila
@@ -116,16 +128,17 @@ services:
       - '14'
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     storage:
       ephemeral-device: '40G'
@@ -138,17 +151,19 @@ services:
     to:
       - '16'
       - '17'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '18'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -158,42 +173,48 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '20'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
   nrpe:
     charm: cs:nrpe

src/tests/bundles/focal-yoga.yaml

@@ -40,22 +40,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-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
   glance-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
@@ -63,17 +70,19 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha:
     num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
+    charm: ch:manila-ganesha
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -81,9 +90,10 @@ services:
       - '4'
       - '5'
       - '6'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -93,15 +103,17 @@ services:
       - '7'
       - '8'
       - '9'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '10'
       - '11'
+    channel: latest/edge
 
   manila:
     charm: ../../../manila
@@ -116,16 +128,17 @@ services:
       - '14'
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     storage:
       ephemeral-device: '40G'
@@ -138,17 +151,19 @@ services:
     to:
       - '16'
       - '17'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '18'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -158,42 +173,48 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '20'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
   nrpe:
     charm: cs:nrpe

src/tests/bundles/hirsute-wallaby.yaml

@@ -1,319 +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':
-  '14':
-  '15':
-  # 16 and 17 are nova compute units
-  '16':
-    constraints: mem=8G
-  '17':
-    constraints: mem=8G
-  '18':
-  '19':
-  '20':
-  '21':
-  '22':
-  '23':
-
-services:
-
-  manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-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'
-
-  manila-ganesha:
-    num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    options:
-      source: *openstack-origin
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '7'
-      - '8'
-      - '9'
-
-  ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '10'
-      - '11'
-
-  manila:
-    charm: ../../../manila
-    num_units: 3
-    options:
-      default-share-backend: cephfsnfs1
-      share-protocols: NFS
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-      - '13'
-      - '14'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '15'
-
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    storage:
-      ephemeral-device: '40G'
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '16'
-      - '17'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '18'
-
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '19'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    to:
-      - '20'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '21'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '22'
-
-  placement:
-    charm: cs:~openstack-charmers-next/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '23'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-  - - 'ceph-mon'
-    - 'ceph-osd'
-
-  - - 'ceph-mon'
-    - 'ceph-fs'
-
-  - - 'ceph-mon'
-    - 'manila-ganesha'
-
-  - - 'manila:shared-db'
-    - 'manila-mysql-router:shared-db'
-  - - 'manila-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila-ganesha'
-    - 'rabbitmq-server'
-
-  - - 'manila-ganesha'
-    - 'keystone'
-
-  - - 'manila'
-    - 'manila-ganesha'
-
-  - - 'manila-ganesha:shared-db'
-    - 'manila-ganesha-mysql-router:shared-db'
-  - - 'manila-ganesha-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'manila'
-    - 'rabbitmq-server'
-
-  - - 'manila'
-    - 'keystone'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - '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-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - 'placement:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nrpe:nrpe-external-master'
-    - 'manila:nrpe-external-master'

src/tests/bundles/impish-xena.yaml

@@ -40,22 +40,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-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
   glance-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
@@ -63,17 +70,19 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha:
     num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
+    charm: ch:manila-ganesha
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -81,9 +90,10 @@ services:
       - '4'
       - '5'
       - '6'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -93,15 +103,17 @@ services:
       - '7'
       - '8'
       - '9'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '10'
       - '11'
+    channel: latest/edge
 
   manila:
     charm: ../../../manila
@@ -116,16 +128,17 @@ services:
       - '14'
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     storage:
       ephemeral-device: '40G'
@@ -138,17 +151,19 @@ services:
     to:
       - '16'
       - '17'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '18'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -158,42 +173,48 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '20'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
   nrpe:
     charm: cs:nrpe

src/tests/bundles/jammy-yoga.yaml

@@ -40,22 +40,29 @@ machines:
 services:
 
   manila-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   manila-ganesha-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   neutron-api-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
   glance-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
@@ -63,17 +70,19 @@ services:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   manila-ganesha:
     num_units: 1
-    charm: cs:~openstack-charmers-next/manila-ganesha
+    charm: ch:manila-ganesha
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *openstack-origin
@@ -81,9 +90,10 @@ services:
       - '4'
       - '5'
       - '6'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     options:
       source: *openstack-origin
@@ -93,15 +103,17 @@ services:
       - '7'
       - '8'
       - '9'
+    channel: latest/edge
 
   ceph-fs:
-    charm: cs:~openstack-charmers-next/ceph-fs
+    charm: ch:ceph-fs
     num_units: 2
     options:
       source: *openstack-origin
     to:
       - '10'
       - '11'
+    channel: latest/edge
 
   manila:
     charm: ../../../manila
@@ -116,16 +128,17 @@ services:
       - '14'
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
     to:
       - '15'
+    channel: latest/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: ch:nova-compute
     num_units: 2
     storage:
       ephemeral-device: '40G'
@@ -138,17 +151,19 @@ services:
     to:
       - '16'
       - '17'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '18'
+    channel: latest/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -158,42 +173,48 @@ services:
       openstack-origin: *openstack-origin
     to:
       - '19'
+    channel: latest/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: latest/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       bridge-mappings: physnet1:br-ex
       openstack-origin: *openstack-origin
     to:
       - '20'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '21'
+    channel: latest/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '22'
+    channel: latest/edge
 
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '23'
+    channel: latest/edge
 
   nrpe:
     charm: cs:nrpe

src/tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -4,8 +4,9 @@ applications:
     options:
       vip: '{{ OS_VIP00 }}'
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     num_units: 0
+    channel: latest/edge
 relations:
 - - manila
   - hacluster

src/tests/tests.yaml

@@ -1,25 +1,19 @@
 charm_name: manila
+
 gate_bundles:
-- bionic-queens
+- ganesha: focal-xena
-- ganesha: bionic-stein
+
-- ganesha: bionic-ussuri
-- ganesha: focal-ussuri
-- ganesha: focal-victoria
 dev_bundles:
-- ganesha: bionic-rocky
-- ganesha: bionic-train
 # Wallaby is currently broken because of a change in the default token-type
 # requirements in manila's policy.json that the charm / tests need to learn to
 # handle
-- ganesha: focal-wallaby
 - ganesha: focal-xena
 - ganesha: focal-yoga
-- ganesha: hirsute-wallaby
 - ganesha: impish-xena
 - ganesha: jammy-yoga
 
 smoke_bundles:
-- ganesha: focal-ussuri
+- ganesha: focal-xena
 
 target_deploy_status:
     nrpe:
@@ -49,6 +43,5 @@ tests_options:
   force_deploy:
     # NOTE(lourot): this is needed because the NRPE charm isn't available on
     # non-LTS Ubuntu series. See lp:1933643
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga