Remove disco support from the charm

Also remove old cosmic test as well.

Change-Id: I4659ba823e2bf66e6ea202be3886e0326ed1c529

src/metadata.yaml

@@ -12,7 +12,6 @@ tags:
 series:
   - xenial
   - bionic
-  - disco
   - eoan
 subordinate: false
 requires:

src/tests/bundles/bionic-train.yaml

@@ -48,7 +48,6 @@ applications:
     expose: True
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
-    
     options:
       network-manager: Neutron
       openstack-origin: cloud:bionic-train
@@ -136,4 +135,4 @@ relations:
 - - 'neutron-openvswitch:amqp'
   - 'rabbitmq-server:amqp'
 - - 'nova-cloud-controller:quantum-network-service'
-  - 'neutron-gateway:quantum-network-service'
+  - 'neutron-gateway:quantum-network-service'

src/tests/bundles/eoan-train.yaml

@@ -1,66 +1,75 @@
-series: cosmic
+series: eoan
 applications:
   ceph-fs:
     charm: ceph-fs
-    series: cosmic
+    series: eoan
     num_units: 1
+    options:
+      source: cloud:eoan-train/proposed
   ceph-osd:
     charm: cs:~openstack-charmers-next/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
+      osd-devices: '/dev/test-non-existent'
+      source: cloud:eoan-train/proposed
   ceph-mon:
     charm: cs:~openstack-charmers-next/ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
+      source: cloud:eoan-train/proposed
   percona-cluster:
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
     options:
       dataset-size: 25%
       max-connections: 1000
+      source: cloud:eoan-train/proposed
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
+    options:
+      source: cloud:eoan-train/proposed
   keystone:
     expose: True
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
+    options:
+      openstack-origin: cloud:eoan-train/proposed
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: cloud:eoan-train/proposed
   glance:
     expose: True
     charm: cs:~openstack-charmers-next/glance
     num_units: 1
+    options:
+      openstack-origin: cloud:eoan-train/proposed
+  cinder:
+    expose: True
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: 'None'
+      glance-api-version: '2'
+      openstack-origin: cloud:eoan-train/proposed
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
   nova-cloud-controller:
     expose: True
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
-      network-manager: Neutron
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+      openstack-origin: cloud:eoan-train/proposed
+  placement:
+    charm: cs:~openstack-charmers-next/placement
     num_units: 1
     options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
-  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
+      openstack-origin: cloud:eoan-train
 relations:
 - - ceph-mon:mds
   - ceph-fs:ceph-mds
@@ -92,6 +101,12 @@ relations:
   - nova-compute:cloud-compute
 - - nova-cloud-controller:image-service
   - glance:image-service
+- - placement
+  - percona-cluster
+- - placement
+  - keystone
+- - placement
+  - nova-cloud-controller
 - - 'neutron-api:shared-db'
   - 'percona-cluster:shared-db'
 - - 'neutron-api:amqp'

src/tests/tests.yaml

@@ -12,7 +12,7 @@ gate_bundles:
 smoke_bundles:
   - bionic-stein
 dev_bundles:
-  - cosmic-rocky
+  - eoan-train
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
   - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network