Switch to all focal func tests

tests/bundles/focal.yaml

@@ -8,16 +8,19 @@ machines:
   '4':
   '5':
   '6':
-    series: bionic
   '7':
-    series: bionic
   '8':
+    constraints: mem=3072M
+  '9':
+    constraints: mem=3072M
+  '10':
+    constraints: mem=3072M
 applications:
   ubuntu:
     charm: cs:ubuntu
     num_units: 1
     to:
-      - '8'
+      - '7'
   ceph-iscsi:
     charm: ../../
     num_units: 2
@@ -47,27 +50,27 @@ applications:
       - '4'
       - '5'
   vault:
-    series: bionic
     num_units: 1
-#    charm: cs:~openstack-charmers-next/vault
-    charm: cs:~gnuoy/vault-29
+    charm: cs:~openstack-charmers-next/vault
     to:
       - '6'
-  mysql:
-    series: bionic
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      innodb-buffer-pool-size: 256M
-      max-connections: 1000
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
     to:
-      - '7'
+      - '8'
+      - '9'
+      - '10'
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
 relations:
-- - ceph-mon:client
-  - ceph-iscsi:ceph-client
-- - vault:certificates
-  - ceph-iscsi:certificates
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - vault:shared-db
-  - mysql:shared-db
+  - - 'ceph-mon:client'
+    - 'ceph-iscsi:ceph-client'
+  - - 'vault:certificates'
+    - 'ceph-iscsi:certificates'
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'