Update bundle

Author: lmlg

src/tests/bundles/focal-ussuri.yaml

@@ -1,46 +1,26 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:focal-ussuri
+
+local_overlay_enabled: False
 
 series: &series focal
 
 machines:
   '0':
-    constraints: "mem=3072M"
   '1':
-    constraints: "mem=3072M"
+    constraints: virt-type=virtual-machine mem=4G
   '2':
-    constraints: "mem=3072M"
+    constraints: virt-type=virtual-machine mem=4G
   '3':
-
+    constraints: virt-type=virtual-machine mem=4G
 
 applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: 8.0/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: 8.0/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: 8.0/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: 8.0/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: 8.0/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
+  ubuntu: # used to test mounts
+    charm: ch:ubuntu
+    num_units: 2
     to:
-      - '0'
-      - '1'
       - '2'
-    channel: 8.0/edge
+      - '3'
 
   ceph-fs:
     charm: ../../../ceph-fs.charm
@@ -51,17 +31,17 @@ applications:
       ec-profile-k: 4
       ec-profile-m: 2
     to:
-      - '3'
+      - '2'
 
   ceph-osd:
     charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G'
+    num_units: 1
     options:
       osd-devices: '/dev/test-non-existent'
       source: *openstack-origin
     channel: octopus/edge
+    to:
+      - '1'
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -70,170 +50,12 @@ applications:
       monitor-count: '3'
       source: *openstack-origin
     channel: octopus/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    channel: 3.8/edge
-
-  keystone:
-    expose: True
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
-
-  glance:
-    expose: True
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
-
-  nova-cloud-controller:
-    expose: True
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: ussuri/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    channel: ussuri/edge
+    to:
+      - '0'
 
 relations:
-
   - - 'ceph-mon:mds'
     - 'ceph-fs:ceph-mds'
 
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:ceph'
-    - 'ceph-mon:client'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
   - - 'ceph-osd:mon'
     - 'ceph-mon:osd'
-
-  - - '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'
-    - 'keystone'
-
-  - - 'placement'
-    - 'nova-cloud-controller'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'