Migrate charm charmhub for stable/ussuri

- start from stable/ussuri branch
- Do charmcraft, osci, zuul changes
- Modify libs to point to stable/ussuri for:
  - charmhelpers
  - charms.openstack (as needed)
  - zaza & zaza.openstack.tests
- Remove unsupported test bundles
- migration bundles to charmhub.io (ch: prefix + channels)
- Build on 18.04 amd64
- Run on 18.04 amd64, s390x, ppc64el, arm64
- Run on 20.04 amd64, s390x, ppc64el, arm64

Change-Id: If4a981dafe3ebb96bcbef80d3c1fd9d5eb32bb82

.gitignore

@@ -14,3 +14,4 @@ func-results.json
 __pycache__
 .stestr/
 tests/cirros*
+*.charm

.gitreview

@@ -3,4 +3,4 @@ host=review.opendev.org
 port=29418
 project=openstack/charm-heat.git
 
-defaultbranch=stable/21.10
+defaultbranch=stable/ussuri

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-jobs
+      - openstack-python3-ussuri-jobs
       - openstack-cover-jobs

build-requirements.txt

@@ -0,0 +1,7 @@
+# NOTES(lourot):
+# * We don't install charmcraft via pip anymore because it anyway spins up a
+#   container and scp the system's charmcraft snap inside it. So the charmcraft
+#   snap is necessary on the system anyway.
+# * `tox -e build` successfully validated with charmcraft 1.2.1
+
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.

charm-helpers-hooks.yaml

@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers@stable/21.10
+repo: https://github.com/juju/charm-helpers@stable/ussuri
 destination: hooks/charmhelpers
 include:
     - core

charmcraft.yaml

@@ -0,0 +1,36 @@
+type: charm
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - charmhelpers/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - actions.yaml
+      - config.yaml
+      - copyright
+      - hardening.yaml
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+bases:
+  - build-on:
+      - name: ubuntu
+        channel: "18.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "18.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]

metadata.yaml

@@ -8,12 +8,8 @@ description: |
 tags:
 - openstack
 series:
-- xenial
 - bionic
 - focal
-- groovy
-- hirsute
-- impish
 extra-bindings:
   public:
   admin:

osci.yaml

@@ -1,10 +1,10 @@
 - project:
     templates:
-      - charm-unit-jobs
-      - charm-functional-jobs
-    check:
-      jobs:
-        - focal-xena:
-            voting: false
-        - impish-xena:
-            voting: false
+      - charm-unit-jobs-py36
+      - charm-unit-jobs-py38
+      - charm-train-functional-jobs
+      - charm-ussuri-functional-jobs
+    vars:
+      needs_charm_build: true
+      charm_build_name: heat
+      build_type: charmcraft

rename.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm

test-requirements.txt

@@ -7,6 +7,7 @@
 #       requirements.  They are intertwined.  Also, Zaza itself should specify
 #       all of its own requirements and if it doesn't, fix it there.
 #
+pyparsing<3.0.0  # cffi needs pyparsing < 3.0.0.
 cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
@@ -37,8 +38,8 @@ oslo.utils<=3.41.0;python_version<'3.6'
 
 coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
-git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/ussuri#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/ussuri#egg=zaza.openstack
 
 # Needed for charm-glance:
 git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'

tests/bundles/bionic-queens.yaml

@@ -1,141 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series bionic
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-  8: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: bionic
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '7'
-      - '8'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - neutron-gateway:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:quantum-network-service
-    - neutron-gateway:quantum-network-service
-  - - 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:identity-service
-    - keystone:identity-service
-  - - nova-compute:neutron-plugin
-    - neutron-openvswitch:neutron-plugin
-  - - rabbitmq-server:amqp
-    - neutron-openvswitch:amqp

tests/bundles/bionic-rocky.yaml

@@ -1,141 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-rocky
-
-series: &series bionic
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-  8: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: bionic
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '7'
-      - '8'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - neutron-gateway:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:quantum-network-service
-    - neutron-gateway:quantum-network-service
-  - - 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:identity-service
-    - keystone:identity-service
-  - - nova-compute:neutron-plugin
-    - neutron-openvswitch:neutron-plugin
-  - - rabbitmq-server:amqp
-    - neutron-openvswitch:amqp

tests/bundles/bionic-stein.yaml

@@ -1,141 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-stein
-
-series: &series bionic
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-  8: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: bionic
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '7'
-      - '8'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - neutron-gateway:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:quantum-network-service
-    - neutron-gateway:quantum-network-service
-  - - 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:identity-service
-    - keystone:identity-service
-  - - nova-compute:neutron-plugin
-    - neutron-openvswitch:neutron-plugin
-  - - rabbitmq-server:amqp
-    - neutron-openvswitch:amqp

tests/bundles/bionic-train.yaml

@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin cloud:bionic-train
 
@@ -22,7 +24,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
+    charm: ch:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
@@ -31,29 +33,33 @@ applications:
       source: *openstack-origin
     to:
       - '0'
+    channel: 5.7/edge
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '1'
+    channel: ussuri/edge
   rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
+    channel: 3.8/edge
   glance:
-    charm: cs:~openstack-charmers/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: ussuri/edge
   nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -61,8 +67,9 @@ applications:
       network-manager: Neutron
     to:
       - '4'
+    channel: ussuri/edge
   nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -70,8 +77,9 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
+    channel: ussuri/edge
   placement:
-    charm: cs:~openstack-charmers/placement
+    charm: ch:placement
     num_units: 1
     constraints: mem=1G
     options:
@@ -79,24 +87,28 @@ applications:
       debug: "True"
     to:
       - '6'
+    channel: ussuri/edge
   neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '7'
+    channel: ussuri/edge
   neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '8'
+    channel: ussuri/edge
   neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: ussuri/edge
   heat:
-    charm: ../../../heat
+    charm: ../../heat.charm
     num_units: 2
     series: bionic
     constraints: mem=2048

tests/bundles/bionic-ussuri.yaml

@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin cloud:bionic-ussuri
 
@@ -24,7 +26,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
+    charm: ch:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
@@ -33,29 +35,33 @@ applications:
       source: *openstack-origin
     to:
       - '0'
+    channel: 5.7/edge
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '1'
+    channel: ussuri/edge
   rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
+    channel: 3.8/edge
   glance:
-    charm: cs:~openstack-charmers/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: ussuri/edge
   nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -63,8 +69,9 @@ applications:
       network-manager: Neutron
     to:
       - '4'
+    channel: ussuri/edge
   nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -72,23 +79,26 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
+    channel: ussuri/edge
   placement:
-    charm: cs:~openstack-charmers/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: "True"
     to:
       - '6'
+    channel: ussuri/edge
   neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '7'
+    channel: ussuri/edge
   neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -96,10 +106,12 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '8'
+    channel: ussuri/edge
   neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: ussuri/edge
   heat:
-    charm: ../../../heat
+    charm: ../../heat.charm
     num_units: 2
     options:
       openstack-origin: *openstack-origin

tests/bundles/focal-ussuri.yaml

@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin distro
 
@@ -29,20 +31,26 @@ machines:
 applications:
 
   heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -50,33 +58,37 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: 8.0/edge
 
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: ussuri/edge
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '4'
+    channel: 3.8/edge
 
   glance:
-    charm: cs:~openstack-charmers/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '5'
+    channel: ussuri/edge
 
   nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
+    charm: ch:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -84,9 +96,10 @@ applications:
       network-manager: Neutron
     to:
       - '6'
+    channel: ussuri/edge
 
   nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
+    charm: ch:nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -94,26 +107,29 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
+    channel: ussuri/edge
 
   placement:
-    charm: cs:~openstack-charmers/placement
+    charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       debug: "True"
     to:
       - '8'
+    channel: ussuri/edge
 
   neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
+    charm: ch:neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '9'
+    channel: ussuri/edge
 
   neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
+    charm: ch:neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -121,12 +137,14 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
+    channel: ussuri/edge
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
+    charm: ch:neutron-openvswitch
+    channel: ussuri/edge
 
   heat:
-    charm: ../../../heat
+    charm: ../../heat.charm
     num_units: 2
     constraints: mem=2048
     options:

tests/bundles/focal-victoria.yaml

@@ -1,226 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-series: &series focal
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - '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'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "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:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/focal-wallaby.yaml

@@ -1,226 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-wallaby
-
-series: &series focal
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - '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'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "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:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/focal-xena.yaml

@@ -1,226 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
-
-series: &series focal
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - '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'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "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:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/groovy-victoria.yaml

@@ -1,226 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series groovy
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - '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'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "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:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/hirsute-wallaby.yaml

@@ -1,226 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series hirsute
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - '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'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "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:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/impish-xena.yaml

@@ -1,226 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series impish
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  placement-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  neutron-api-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-
-  placement:
-    charm: cs:~openstack-charmers/placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - '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'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "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:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/trusty-mitaka.yaml

@@ -1,108 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:trusty-mitaka
-
-series: &series trusty
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:trusty/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: trusty
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '6'
-      - '7'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp

tests/bundles/xenial-mitaka.yaml

@@ -1,108 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: xenial
-    constraints: mem=2048
-    options:
-      debug: "True"
-      verbose: "True"
-    to:
-      - '6'
-      - '7'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp

tests/bundles/xenial-ocata.yaml

@@ -1,141 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-ocata
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-  8: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: xenial
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '7'
-      - '8'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - neutron-gateway:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:quantum-network-service
-    - neutron-gateway:quantum-network-service
-  - - 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:identity-service
-    - keystone:identity-service
-  - - nova-compute:neutron-plugin
-    - neutron-openvswitch:neutron-plugin
-  - - rabbitmq-server:amqp
-    - neutron-openvswitch:amqp

tests/bundles/xenial-pike.yaml

@@ -1,141 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-pike
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-  8: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: xenial
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '7'
-      - '8'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - neutron-gateway:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:quantum-network-service
-    - neutron-gateway:quantum-network-service
-  - - 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:identity-service
-    - keystone:identity-service
-  - - nova-compute:neutron-plugin
-    - neutron-openvswitch:neutron-plugin
-  - - rabbitmq-server:amqp
-    - neutron-openvswitch:amqp

tests/bundles/xenial-queens.yaml

@@ -1,141 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:xenial-queens
-
-series: &series xenial
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5:
-    constraints: "root-disk=20G mem=4G"
-  6: {}
-  7: {}
-  8: {}
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      dataset-size: 25%
-      max-connections: 1000
-      source: *openstack-origin
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '1'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '4'
-  nova-compute:
-    charm: cs:~openstack-charmers/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '5'
-  neutron-gateway:
-    charm: cs:~openstack-charmers/neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  neutron-api:
-    charm: cs:~openstack-charmers/neutron-api
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers/neutron-openvswitch
-  heat:
-    charm: ../../../heat
-    num_units: 2
-    series: xenial
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '7'
-      - '8'
-relations:
-  - - heat:amqp
-    - rabbitmq-server:amqp
-  - - heat:identity-service
-    - keystone:identity-service
-  - - heat:shared-db
-    - percona-cluster:shared-db
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:shared-db
-    - percona-cluster:shared-db
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:shared-db
-    - percona-cluster:shared-db
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - neutron-gateway:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:quantum-network-service
-    - neutron-gateway:quantum-network-service
-  - - 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:identity-service
-    - keystone:identity-service
-  - - nova-compute:neutron-plugin
-    - neutron-openvswitch:neutron-plugin
-  - - rabbitmq-server:amqp
-    - neutron-openvswitch:amqp

tests/tests.yaml

@@ -4,25 +4,11 @@ smoke_bundles:
   - focal-ussuri
 
 gate_bundles:
-  - xenial-mitaka
-  - bionic-queens
-  - bionic-stein
   - bionic-train
   - bionic-ussuri
   - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
-  - focal-xena
-  - groovy-victoria
 
-dev_bundles:
-  - trusty-mtaka
-  - xenial-ocata
-  - xenial-pike
-  - xenial-queens
-  - bionic-rocky
-  - hirsute-wallaby
-  - impish-xena
+dev_bundles: []
 
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_cirros_image
@@ -36,6 +22,4 @@ tests:
 tests_options:
   policyd:
     service: heat
-  force_deploy:
-    - groovy-victoria
-    - impish-xena
+  force_deploy: []

tox.ini

@@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir}
 install_command =
   {toxinidir}/pip.sh install {opts} {packages}
 commands = stestr run --slowest {posargs}
-allowlist_externals = juju
+allowlist_externals =
+    charmcraft
+    rename.sh
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 
-[testenv:py35]
-basepython = python3.5
+[testenv:build]
+basepython = python3
+deps = -r{toxinidir}/build-requirements.txt
+commands =
+    charmcraft clean
+    charmcraft -v build
+    {toxinidir}/rename.sh
+
+[testenv:py3]
+basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
@@ -50,21 +60,25 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python3.6
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-
-[testenv:py37]
-basepython = python3.7
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:py38]
 basepython = python3.8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
-[testenv:py3]
-basepython = python3
+[testenv:py39]
+basepython = python3.9
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3