Merge "Remove disco support from the charm"

metadata.yaml

@@ -22,7 +22,6 @@ series:
   - xenial
   - bionic
   - eoan
-  - disco
   - trusty
 provides:
   nrpe-external-master:

tests/bundles/disco-stein.yaml

@@ -1,131 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series disco
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1: {}
-  2: {}
-  3: {}
-  4: {}
-  5: {}
-  6: {}
-  7:
-    constraints: "root-disk=20G mem=4G"
-  8:
-    constraints: "root-disk=20G mem=4G"
-
-# 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-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '1'
-  neutron-api:
-    charm: ../../../neutron-api
-    series: *series
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    to:
-      - '2'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-  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: *openstack-origin
-    to:
-      - '5'
-  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    to:
-      - '7'
-      - '8'
-relations:
-  - - '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:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-  - - 'nova-cloud-controller:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance:shared-db'
-    - 'percona-cluster:shared-db'
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'

tests/tests.yaml

@@ -20,8 +20,6 @@ gate_bundles:
 smoke_bundles:
   - bionic-train
 dev_bundles:
-  - cosmic-rocky
-  - disco-stein
 tests:
   - zaza.openstack.charm_tests.neutron.tests.NeutronApiTest
   - zaza.openstack.charm_tests.neutron.tests.SecurityTest