Merge ~vultaire/bootstack-qa:reorder into bootstack-qa:main

[Paul Goins]

Re-ordered base bundles and fixed overlays

Base bundle changes:

* Apps associated with explicit machines are listed first, ordered by
  machine number, then by app name.
* Apps without an explicit machine association are listed after,
  ordered by app name.

Overlay changes:

* Re-ordered:
  * Cloud origin overrides first, LMA charm candidate channel overrides
    next
  * Alphanumeric sort within each group
* Repaired:
  * Mismatched names: elasticsearch -> elastic, mongodb -> mongo
  * Corrected config options: source -> openstack-origin for some
    charms
* Added: overrides for additional charms which pull packages from UCA
  (keystone (inconsistently applied), percona-cluster, rabbitmq-server)

[Xav Paice (xavpaice)]

LGTM

review: Approve

diff --git a/tests/bundles/bionic-stable.yaml b/tests/bundles/bionic-stable.yaml
index 62fd240..145c3a6 100644
--- a/tests/bundles/bionic-stable.yaml
+++ b/tests/bundles/bionic-stable.yaml
@@ -7,6 +7,14 @@ applications:
       monitor-count: 1
     to:
       - "0"
+  # Skipping placement; placement not compatible with bionic/stein
+  prometheus-openstack-exporter:
+    charm: cs:prometheus-openstack-exporter
+    num_units: 1
+    options:
+      snap_channel: stable
+    to:
+      - "0"
   ceph-osd:
     charm: cs:ceph-osd
     num_units: 3
@@ -23,22 +31,25 @@ applications:
     num_units: 1
     to:
       - "1"
-  elastic:
-    charm: cs:elasticsearch
+  neutron-api:
+    charm: cs:neutron-api
     num_units: 1
+    to:
+      - "1"
     options:
-      es-heap-size: 1
-  filebeat:
-    charm: cs:filebeat
-  fstab-config:
-    charm: cs:fstab-config
+      manage-neutron-plugin-legacy-mode: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+  nova-compute:
+    charm: cs:nova-compute
     num_units: 1
-  grafana:
-    charm: cs:grafana
+    to:
+      - "2"
+  glance:
+    charm: cs:glance
     num_units: 1
-    options:
-      install_method: snap
-      snap_channel: 21.04/stable
+    to:
+      - "3"
   graylog:
     charm: cs:graylog
     num_units: 1
@@ -46,14 +57,6 @@ applications:
       channel: 2/stable
     to:
       - "4"
-  hw-health:
-    charm: cs:hw-health
-  keystone:
-    charm: cs:keystone
-    num_units: 1
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
   mysql:
     charm: cs:percona-cluster
     num_units: 1
@@ -66,22 +69,14 @@ applications:
       - "6"
     options:
       enable_livestatus: true
-  thruk-agent:
-    charm: cs:thruk-agent
-    num_units: 0
-  nrpe:
-    charm: cs:nrpe
-    options:
-      swap: ''
-  nova-cloud-controller:
-    charm: cs:nova-cloud-controller
-    num_units: 1
-  cinder:
-    charm: cs:cinder
-    num_units: 1
-  rabbitmq-server:
-    charm: cs:rabbitmq-server
+  openstack-service-checks:
+    charm: cs:openstack-service-checks
     num_units: 1
+    options:
+      check-neutron-agents: False
+      check-octavia: False
+    to:
+      - "7"
   prometheus:
     charm: cs:prometheus2
     num_units: 1
@@ -97,45 +92,50 @@ applications:
     num_units: 1
     to:
       - "8"
-  prometheus-openstack-exporter:
-    charm: cs:prometheus-openstack-exporter
+  elastic:
+    charm: cs:elasticsearch
     num_units: 1
     options:
-      snap_channel: stable
-    to:
-      - "0"
-  openstack-service-checks:
-    charm: cs:openstack-service-checks
+      es-heap-size: 1
+  filebeat:
+    charm: cs:filebeat
+  fstab-config:
+    charm: cs:fstab-config
+    num_units: 1
+  grafana:
+    charm: cs:grafana
     num_units: 1
     options:
-      check-neutron-agents: False
-      check-octavia: False
-    to:
-      - "7"
+      install_method: snap
+      snap_channel: 21.04/stable
+  hw-health:
+    charm: cs:hw-health
+  keystone:
+    charm: cs:keystone
+    num_units: 1
+  mongo:
+    charm: cs:mongodb
+    num_units: 1
+  thruk-agent:
+    charm: cs:thruk-agent
+    num_units: 0
+  nrpe:
+    charm: cs:nrpe
+    options:
+      swap: ''
+  nova-cloud-controller:
+    charm: cs:nova-cloud-controller
+    num_units: 1
+  cinder:
+    charm: cs:cinder
+    num_units: 1
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
+    num_units: 1
   sysconfig:
     charm: cs:sysconfig
   telegraf:
     charm: cs:telegraf-41
-  nova-compute:
-    charm: cs:nova-compute
-    num_units: 1
-    to:
-      - "2"
-  glance:
-    charm: cs:glance
-    num_units: 1
-    to:
-      - "3"
-  neutron-api:
-    charm: cs:neutron-api
-    num_units: 1
-    to:
-      - "1"
-    options:
-      manage-neutron-plugin-legacy-mode: True
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-  # Skipping placement; placement not compatible with bionic/stein
   neutron-openvswitch:
     charm: cs:neutron-openvswitch
     num_units: 0
diff --git a/tests/bundles/focal-stable.yaml b/tests/bundles/focal-stable.yaml
index 3839a8f..033ec64 100644
--- a/tests/bundles/focal-stable.yaml
+++ b/tests/bundles/focal-stable.yaml
@@ -7,6 +7,18 @@ applications:
       monitor-count: 1
     to:
       - "0"
+  placement:
+    charm: cs:placement
+    num_units: 1
+    to:
+      - "0"
+  prometheus-openstack-exporter:
+    charm: cs:prometheus-openstack-exporter
+    num_units: 1
+    options:
+      snap_channel: stable
+    to:
+      - "0"
   ceph-osd:
     charm: cs:ceph-osd
     num_units: 3
@@ -23,22 +35,25 @@ applications:
     num_units: 1
     to:
       - "1"
-  elastic:
-    charm: cs:elasticsearch
+  neutron-api:
+    charm: cs:neutron-api
     num_units: 1
+    to:
+      - "1"
     options:
-      es-heap-size: 1
-  filebeat:
-    charm: cs:filebeat
-  fstab-config:
-    charm: cs:fstab-config
+      manage-neutron-plugin-legacy-mode: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+  nova-compute:
+    charm: cs:nova-compute
     num_units: 1
-  grafana:
-    charm: cs:grafana
+    to:
+      - "2"
+  glance:
+    charm: cs:glance
     num_units: 1
-    options:
-      install_method: snap
-      snap_channel: 21.04/stable
+    to:
+      - "3"
   graylog:
     charm: cs:graylog
     num_units: 1
@@ -46,14 +61,6 @@ applications:
       channel: 2/stable
     to:
       - "4"
-  hw-health:
-    charm: cs:hw-health
-  keystone:
-    charm: cs:keystone
-    num_units: 1
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
   mysql:
     charm: cs:percona-cluster
     num_units: 1
@@ -68,23 +75,14 @@ applications:
       - "6"
     options:
       enable_livestatus: true
-  thruk-agent:
-    charm: cs:thruk-agent
-    num_units: 0
-    series: bionic
-  nrpe:
-    charm: cs:nrpe
-    options:
-      swap: ''
-  nova-cloud-controller:
-    charm: cs:nova-cloud-controller
-    num_units: 1
-  cinder:
-    charm: cs:cinder
-    num_units: 1
-  rabbitmq-server:
-    charm: cs:rabbitmq-server
+  openstack-service-checks:
+    charm: cs:openstack-service-checks
     num_units: 1
+    options:
+      check-neutron-agents: False
+      check-octavia: False
+    to:
+      - "7"
   prometheus:
     charm: cs:prometheus2
     num_units: 1
@@ -100,49 +98,51 @@ applications:
     num_units: 1
     to:
       - "8"
-  prometheus-openstack-exporter:
-    charm: cs:prometheus-openstack-exporter
+  elastic:
+    charm: cs:elasticsearch
     num_units: 1
     options:
-      snap_channel: stable
-    to:
-      - "0"
-  openstack-service-checks:
-    charm: cs:openstack-service-checks
+      es-heap-size: 1
+  filebeat:
+    charm: cs:filebeat
+  fstab-config:
+    charm: cs:fstab-config
     num_units: 1
-    options:
-      check-neutron-agents: False
-      check-octavia: False
-    to:
-      - "7"
-  sysconfig:
-    charm: cs:sysconfig
-  telegraf:
-    charm: cs:telegraf-41
-  nova-compute:
-    charm: cs:nova-compute
+  grafana:
+    charm: cs:grafana
     num_units: 1
-    to:
-      - "2"
-  glance:
-    charm: cs:glance
+    options:
+      install_method: snap
+      snap_channel: 21.04/stable
+  hw-health:
+    charm: cs:hw-health
+  keystone:
+    charm: cs:keystone
     num_units: 1
-    to:
-      - "3"
-  neutron-api:
-    charm: cs:neutron-api
+  mongo:
+    charm: cs:mongodb
     num_units: 1
-    to:
-      - "1"
+  thruk-agent:
+    charm: cs:thruk-agent
+    num_units: 0
+    series: bionic
+  nrpe:
+    charm: cs:nrpe
     options:
-      manage-neutron-plugin-legacy-mode: True
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-  placement:
-    charm: cs:placement
+      swap: ''
+  nova-cloud-controller:
+    charm: cs:nova-cloud-controller
     num_units: 1
-    to:
-      - "0"
+  cinder:
+    charm: cs:cinder
+    num_units: 1
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
+    num_units: 1
+  sysconfig:
+    charm: cs:sysconfig
+  telegraf:
+    charm: cs:telegraf-41
   neutron-openvswitch:
     charm: cs:neutron-openvswitch
     num_units: 0
diff --git a/tests/bundles/overlays/bionic-candidate.yaml.j2 b/tests/bundles/overlays/bionic-candidate.yaml.j2
index 1023d1d..34352d9 100644
--- a/tests/bundles/overlays/bionic-candidate.yaml.j2
+++ b/tests/bundles/overlays/bionic-candidate.yaml.j2
@@ -21,6 +21,8 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   openstack-service-checks:
@@ -29,5 +31,3 @@ applications:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
diff --git a/tests/bundles/overlays/bionic-stein-candidate.yaml.j2 b/tests/bundles/overlays/bionic-stein-candidate.yaml.j2
index 0738ab1..4c5cb03 100644
--- a/tests/bundles/overlays/bionic-stein-candidate.yaml.j2
+++ b/tests/bundles/overlays/bionic-stein-candidate.yaml.j2
@@ -5,23 +5,31 @@ applications:
   ceph-osd:
     options:
       source: cloud:bionic-stein
-  nova-cloud-controller:
-    options:
-      openstack-origin: cloud:bionic-stein
   cinder:
     options:
       openstack-origin: cloud:bionic-stein
-  nova-compute:
+  glance:
     options:
       openstack-origin: cloud:bionic-stein
-  glance:
-    num_units: 1
+  keystone:
     options:
       openstack-origin: cloud:bionic-stein
+  mysql:
+    options:
+      source: cloud:bionic-stein
   neutron-api:
     options:
       openstack-origin: cloud:bionic-stein
-  elasticsearch:
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:bionic-stein
+  nova-compute:
+    options:
+      openstack-origin: cloud:bionic-stein
+  rabbitmq-server:
+    options:
+      source: cloud:bionic-stein
+  elastic:
     channel: candidate
   fstab-config:
     channel: candidate
@@ -31,7 +39,7 @@ applications:
     channel: candidate
   hw-health:
     channel: candidate
-  mongodb:
+  mongo:
     channel: candidate
   nagios:
     channel: candidate
@@ -43,6 +51,8 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   openstack-service-checks:
@@ -51,5 +61,3 @@ applications:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
diff --git a/tests/bundles/overlays/bionic-stein-stable.yaml.j2 b/tests/bundles/overlays/bionic-stein-stable.yaml.j2
index 565ac24..5d17bbd 100644
--- a/tests/bundles/overlays/bionic-stein-stable.yaml.j2
+++ b/tests/bundles/overlays/bionic-stein-stable.yaml.j2
@@ -5,19 +5,27 @@ applications:
   ceph-osd:
     options:
       source: cloud:bionic-stein
-  nova-cloud-controller:
-    options:
-      openstack-origin: cloud:bionic-stein
   cinder:
     options:
       openstack-origin: cloud:bionic-stein
-  nova-compute:
+  glance:
     options:
       openstack-origin: cloud:bionic-stein
-  glance:
-    num_units: 1
+  keystone:
     options:
       openstack-origin: cloud:bionic-stein
+  mysql:
+    options:
+      source: cloud:bionic-stein
   neutron-api:
     options:
       openstack-origin: cloud:bionic-stein
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:bionic-stein
+  nova-compute:
+    options:
+      openstack-origin: cloud:bionic-stein
+  rabbitmq-server:
+    options:
+      source: cloud:bionic-stein
diff --git a/tests/bundles/overlays/bionic-train-candidate.yaml.j2 b/tests/bundles/overlays/bionic-train-candidate.yaml.j2
index 67f2c9e..df2f9fb 100644
--- a/tests/bundles/overlays/bionic-train-candidate.yaml.j2
+++ b/tests/bundles/overlays/bionic-train-candidate.yaml.j2
@@ -5,22 +5,27 @@ applications:
   ceph-osd:
     options:
       source: cloud:bionic-train
-  nova-cloud-controller:
-    options:
-      openstack-origin: cloud:bionic-train
   cinder:
     options:
       openstack-origin: cloud:bionic-train
-  nova-compute:
+  glance:
     options:
       openstack-origin: cloud:bionic-train
-  glance:
-    num_units: 1
+  keystone:
     options:
       openstack-origin: cloud:bionic-train
+  mysql:
+    options:
+      source: cloud:bionic-train
   neutron-api:
     options:
       openstack-origin: cloud:bionic-train
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:bionic-train
+  nova-compute:
+    options:
+      openstack-origin: cloud:bionic-train
   placement:
     charm: cs:placement
     num_units: 1
@@ -28,7 +33,10 @@ applications:
       - "0"
     options:
       openstack-origin: cloud:bionic-train
-  elasticsearch:
+  rabbitmq-server:
+    options:
+      source: cloud:bionic-train
+  elastic:
     channel: candidate
   fstab-config:
     channel: candidate
@@ -38,7 +46,7 @@ applications:
     channel: candidate
   hw-health:
     channel: candidate
-  mongodb:
+  mongo:
     channel: candidate
   nagios:
     channel: candidate
@@ -50,6 +58,8 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   openstack-service-checks:
@@ -58,8 +68,6 @@ applications:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
 relations:
 - - placement:shared-db
   - mysql:shared-db
diff --git a/tests/bundles/overlays/bionic-train-stable.yaml.j2 b/tests/bundles/overlays/bionic-train-stable.yaml.j2
index 98835d1..134af99 100644
--- a/tests/bundles/overlays/bionic-train-stable.yaml.j2
+++ b/tests/bundles/overlays/bionic-train-stable.yaml.j2
@@ -5,22 +5,27 @@ applications:
   ceph-osd:
     options:
       source: cloud:bionic-train
-  nova-cloud-controller:
-    options:
-      openstack-origin: cloud:bionic-train
   cinder:
     options:
       openstack-origin: cloud:bionic-train
-  nova-compute:
+  glance:
     options:
       openstack-origin: cloud:bionic-train
-  glance:
-    num_units: 1
+  keystone:
     options:
       openstack-origin: cloud:bionic-train
+  mysql:
+    options:
+      source: cloud:bionic-train
   neutron-api:
     options:
       openstack-origin: cloud:bionic-train
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:bionic-train
+  nova-compute:
+    options:
+      openstack-origin: cloud:bionic-train
   placement:
     charm: cs:placement
     num_units: 1
@@ -28,6 +33,9 @@ applications:
       - "0"
     options:
       openstack-origin: cloud:bionic-train
+  rabbitmq-server:
+    options:
+      source: cloud:bionic-train
 relations:
 - - placement:shared-db
   - mysql:shared-db
diff --git a/tests/bundles/overlays/bionic-ussuri-candidate.yaml.j2 b/tests/bundles/overlays/bionic-ussuri-candidate.yaml.j2
index 8b25bad..6a5dd12 100644
--- a/tests/bundles/overlays/bionic-ussuri-candidate.yaml.j2
+++ b/tests/bundles/overlays/bionic-ussuri-candidate.yaml.j2
@@ -1,4 +1,3 @@
-series: bionic
 applications:
   ceph-mon:
     options:
@@ -6,22 +5,27 @@ applications:
   ceph-osd:
     options:
       source: cloud:bionic-ussuri
-  nova-cloud-controller:
-    options:
-      openstack-origin: cloud:bionic-ussuri
   cinder:
     options:
       openstack-origin: cloud:bionic-ussuri
-  nova-compute:
+  glance:
     options:
       openstack-origin: cloud:bionic-ussuri
-  glance:
-    num_units: 1
+  keystone:
     options:
       openstack-origin: cloud:bionic-ussuri
+  mysql:
+    options:
+      source: cloud:bionic-ussuri
   neutron-api:
     options:
       openstack-origin: cloud:bionic-ussuri
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  nova-compute:
+    options:
+      openstack-origin: cloud:bionic-ussuri
   placement:
     charm: cs:placement
     num_units: 1
@@ -29,7 +33,10 @@ applications:
       - "0"
     options:
       openstack-origin: cloud:bionic-ussuri
-  elasticsearch:
+  rabbitmq-server:
+    options:
+      source: cloud:bionic-ussuri
+  elastic:
     channel: candidate
   fstab-config:
     channel: candidate
@@ -39,7 +46,7 @@ applications:
     channel: candidate
   hw-health:
     channel: candidate
-  mongodb:
+  mongo:
     channel: candidate
   nagios:
     channel: candidate
@@ -51,6 +58,8 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   openstack-service-checks:
@@ -59,8 +68,6 @@ applications:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
 relations:
 - - placement:shared-db
   - mysql:shared-db
diff --git a/tests/bundles/overlays/bionic-ussuri-stable.yaml.j2 b/tests/bundles/overlays/bionic-ussuri-stable.yaml.j2
index 82263f9..fa26dd2 100644
--- a/tests/bundles/overlays/bionic-ussuri-stable.yaml.j2
+++ b/tests/bundles/overlays/bionic-ussuri-stable.yaml.j2
@@ -1,4 +1,3 @@
-series: bionic
 applications:
   ceph-mon:
     options:
@@ -6,22 +5,27 @@ applications:
   ceph-osd:
     options:
       source: cloud:bionic-ussuri
-  nova-cloud-controller:
-    options:
-      openstack-origin: cloud:bionic-ussuri
   cinder:
     options:
       openstack-origin: cloud:bionic-ussuri
-  nova-compute:
+  glance:
     options:
       openstack-origin: cloud:bionic-ussuri
-  glance:
-    num_units: 1
+  keystone:
     options:
       openstack-origin: cloud:bionic-ussuri
+  mysql:
+    options:
+      source: cloud:bionic-ussuri
   neutron-api:
     options:
       openstack-origin: cloud:bionic-ussuri
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  nova-compute:
+    options:
+      openstack-origin: cloud:bionic-ussuri
   placement:
     charm: cs:placement
     num_units: 1
@@ -29,6 +33,9 @@ applications:
       - "0"
     options:
       openstack-origin: cloud:bionic-ussuri
+  rabbitmq-server:
+    options:
+      source: cloud:bionic-ussuri
 relations:
 - - placement:shared-db
   - mysql:shared-db
diff --git a/tests/bundles/overlays/focal-candidate.yaml.j2 b/tests/bundles/overlays/focal-candidate.yaml.j2
index 877e785..34352d9 100644
--- a/tests/bundles/overlays/focal-candidate.yaml.j2
+++ b/tests/bundles/overlays/focal-candidate.yaml.j2
@@ -1,6 +1,5 @@
-series: focal
 applications:
-  elasticsearch:
+  elastic:
     channel: candidate
   fstab-config:
     channel: candidate
@@ -10,7 +9,7 @@ applications:
     channel: candidate
   hw-health:
     channel: candidate
-  mongodb:
+  mongo:
     channel: candidate
   nagios:
     channel: candidate
@@ -22,6 +21,8 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   openstack-service-checks:
@@ -30,5 +31,3 @@ applications:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
diff --git a/tests/bundles/overlays/focal-victoria-candidate.yaml.j2 b/tests/bundles/overlays/focal-victoria-candidate.yaml.j2
index ed92c16..1f3ef85 100644
--- a/tests/bundles/overlays/focal-victoria-candidate.yaml.j2
+++ b/tests/bundles/overlays/focal-victoria-candidate.yaml.j2
@@ -1,6 +1,38 @@
-series: focal
 applications:
-  elasticsearch:
+  ceph-mon:
+    options:
+      source: cloud:focal-victoria
+  ceph-osd:
+    options:
+      source: cloud:focal-victoria
+  cinder:
+    options:
+      openstack-origin: cloud:focal-victoria
+  glance:
+    options:
+      openstack-origin: cloud:focal-victoria
+  keystone:
+    options:
+      openstack-origin: cloud:focal-victoria
+  mysql:
+    options:
+      source: cloud:focal-victoria
+  neutron-api:
+    options:
+      openstack-origin: cloud:focal-victoria
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:focal-victoria
+  nova-compute:
+    options:
+      openstack-origin: cloud:focal-victoria
+  placement:
+    options:
+      openstack-origin: cloud:focal-victoria
+  rabbitmq-server:
+    options:
+      source: cloud:focal-victoria
+  elastic:
     channel: candidate
   fstab-config:
     channel: candidate
@@ -10,7 +42,7 @@ applications:
     channel: candidate
   hw-health:
     channel: candidate
-  mongodb:
+  mongo:
     channel: candidate
   nagios:
     channel: candidate
@@ -22,6 +54,8 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   openstack-service-checks:
@@ -30,29 +64,3 @@ applications:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
-  ceph-osd:
-    options:
-      source: cloud:focal-victoria
-  ceph-mon:
-    options:
-      source: cloud:focal-victoria
-  nova-cloud-controller:
-    options:
-      source: cloud:focal-victoria
-  nova-compute:
-    options:
-      source: cloud:focal-victoria
-  keystone:
-    options:
-      source: cloud:focal-victoria
-  cinder:
-    options:
-      source: cloud:focal-victoria
-  glance:
-    options:
-      source: cloud:focal-victoria
-  neutron-api:
-    options:
-      source: cloud:focal-victoria
diff --git a/tests/bundles/overlays/focal-victoria-stable.yaml.j2 b/tests/bundles/overlays/focal-victoria-stable.yaml.j2
index c7eff69..9358d10 100644
--- a/tests/bundles/overlays/focal-victoria-stable.yaml.j2
+++ b/tests/bundles/overlays/focal-victoria-stable.yaml.j2
@@ -1,26 +1,34 @@
-series: focal
 applications:
-  ceph-osd:
-    options:
-      source: cloud:focal-victoria
   ceph-mon:
     options:
       source: cloud:focal-victoria
-  nova-cloud-controller:
-    options:
-      source: cloud:focal-victoria
-  nova-compute:
-    options:
-      source: cloud:focal-victoria
-  keystone:
+  ceph-osd:
     options:
       source: cloud:focal-victoria
   cinder:
     options:
-      source: cloud:focal-victoria
+      openstack-origin: cloud:focal-victoria
   glance:
     options:
+      openstack-origin: cloud:focal-victoria
+  keystone:
+    options:
+      openstack-origin: cloud:focal-victoria
+  mysql:
+    options:
       source: cloud:focal-victoria
   neutron-api:
     options:
+      openstack-origin: cloud:focal-victoria
+  nova-cloud-controller:
+    options:
+      openstack-origin: cloud:focal-victoria
+  nova-compute:
+    options:
+      openstack-origin: cloud:focal-victoria
+  placement:
+    options:
+      openstack-origin: cloud:focal-victoria
+  rabbitmq-server:
+    options:
       source: cloud:focal-victoria
diff --git a/tests/bundles/overlays/xenial-candidate.yaml.j2 b/tests/bundles/overlays/xenial-candidate.yaml.j2
index 7a9bcc9..8b7fbc5 100644
--- a/tests/bundles/overlays/xenial-candidate.yaml.j2
+++ b/tests/bundles/overlays/xenial-candidate.yaml.j2
@@ -21,11 +21,11 @@ applications:
     channel: candidate
   prometheus-ceph-exporter:
     channel: candidate
+  prometheus-libvirt-exporter:
+    channel: candidate
   prometheus-openstack-exporter:
     channel: candidate
   sysconfig:
     channel: candidate
   telegraf:
     channel: candidate
-  prometheus-libvirt-exporter:
-    channel: candidate
diff --git a/tests/bundles/xenial-stable.yaml b/tests/bundles/xenial-stable.yaml
index f703a24..2cde984 100644
--- a/tests/bundles/xenial-stable.yaml
+++ b/tests/bundles/xenial-stable.yaml
@@ -8,6 +8,14 @@ applications:
       source: cloud:xenial-queens
     to:
       - "0"
+  # Skipping placement; placement not compatible with xenial/queens
+  prometheus-openstack-exporter:
+    charm: cs:prometheus-openstack-exporter
+    num_units: 1
+    options:
+      snap_channel: stable
+    to:
+      - "0"
   ceph-osd:
     charm: cs:ceph-osd
     num_units: 3
@@ -25,22 +33,30 @@ applications:
     num_units: 1
     to:
       - "1"
-  elastic:
-    charm: cs:elasticsearch
+  neutron-api:
+    charm: cs:neutron-api
     num_units: 1
+    to:
+      - "1"
     options:
-      es-heap-size: 1
-  filebeat:
-    charm: cs:filebeat
-  fstab-config:
-    charm: cs:fstab-config
+      openstack-origin: cloud:xenial-queens
+      manage-neutron-plugin-legacy-mode: True
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+  nova-compute:
+    charm: cs:nova-compute
+    options:
+      openstack-origin: cloud:xenial-queens
     num_units: 1
-  grafana:
-    charm: cs:grafana
+    to:
+      - "2"
+  glance:
+    charm: cs:glance
     num_units: 1
     options:
-      install_method: snap
-      snap_channel: 21.04/stable
+      openstack-origin: cloud:xenial-queens
+    to:
+      - "3"
   graylog:
     charm: cs:graylog
     num_units: 1
@@ -48,14 +64,6 @@ applications:
       channel: 2/stable
     to:
       - "4"
-  hw-health:
-    charm: cs:hw-health
-  keystone:
-    charm: cs:keystone
-    num_units: 1
-  mongo:
-    charm: cs:mongodb
-    num_units: 1
   mysql:
     charm: cs:percona-cluster
     num_units: 1
@@ -68,26 +76,7 @@ applications:
       - "6"
     options:
       enable_livestatus: true
-  thruk-agent:
-    charm: cs:thruk-agent
-    num_units: 0
-  nrpe:
-    charm: cs:nrpe
-    options:
-      swap: ''
-  nova-cloud-controller:
-    charm: cs:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-  cinder:
-    charm: cs:cinder
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-  rabbitmq-server:
-    charm: cs:rabbitmq-server
-    num_units: 1
+  # Skipping openstack-service-checks; not available on xenial
   prometheus:
     charm: cs:prometheus2
     num_units: 1
@@ -103,43 +92,54 @@ applications:
     num_units: 1
     to:
       - "8"
-  prometheus-openstack-exporter:
-    charm: cs:prometheus-openstack-exporter
+  elastic:
+    charm: cs:elasticsearch
     num_units: 1
     options:
-      snap_channel: stable
-    to:
-      - "0"
-  # Skipping openstack-service-checks; not available on xenial
-  sysconfig:
-    charm: cs:sysconfig
-  telegraf:
-    charm: cs:telegraf-41
-  nova-compute:
-    charm: cs:nova-compute
+      es-heap-size: 1
+  filebeat:
+    charm: cs:filebeat
+  fstab-config:
+    charm: cs:fstab-config
+    num_units: 1
+  grafana:
+    charm: cs:grafana
+    num_units: 1
     options:
-      openstack-origin: cloud:xenial-queens
+      install_method: snap
+      snap_channel: 21.04/stable
+  hw-health:
+    charm: cs:hw-health
+  keystone:
+    charm: cs:keystone
     num_units: 1
-    to:
-      - "2"
-  glance:
-    charm: cs:glance
+  mongo:
+    charm: cs:mongodb
+    num_units: 1
+  thruk-agent:
+    charm: cs:thruk-agent
+    num_units: 0
+  nrpe:
+    charm: cs:nrpe
+    options:
+      swap: ''
+  nova-cloud-controller:
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
-    to:
-      - "3"
-  neutron-api:
-    charm: cs:neutron-api
+  cinder:
+    charm: cs:cinder
     num_units: 1
-    to:
-      - "1"
     options:
       openstack-origin: cloud:xenial-queens
-      manage-neutron-plugin-legacy-mode: True
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-  # Skipping placement; placement not compatible with xenial/queens
+  rabbitmq-server:
+    charm: cs:rabbitmq-server
+    num_units: 1
+  sysconfig:
+    charm: cs:sysconfig
+  telegraf:
+    charm: cs:telegraf-41
   neutron-openvswitch:
     charm: cs:neutron-openvswitch
     num_units: 0