21.10 - Release

Remove the "channel: candidate" from the func-test
bundles.

Change-Id: I2a4ce2fbdf8f39992767b7e793fb14161fd8bc72

src/tests/bundles/bionic-train.yaml

@@ -128,7 +128,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -136,7 +135,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -144,7 +142,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -153,7 +150,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -161,7 +157,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -169,7 +164,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   mysql:
     charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
@@ -178,7 +172,6 @@ services:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       performance-schema: true
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -189,7 +182,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -199,7 +191,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -208,7 +199,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -218,7 +208,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -226,16 +215,13 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -252,20 +238,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate

src/tests/bundles/bionic-ussuri.yaml

@@ -128,7 +128,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -136,7 +135,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -144,7 +142,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -153,7 +150,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -161,7 +157,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -169,7 +164,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   mysql:
     charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
@@ -178,11 +172,9 @@ services:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       performance-schema: true
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 3
@@ -193,7 +185,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -203,7 +194,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -212,7 +202,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -222,7 +211,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -230,12 +218,10 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -252,20 +238,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate

src/tests/bundles/focal-ussuri.yaml

@@ -137,38 +137,28 @@ relations:
 services:
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   keystone-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   glance-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   neutron-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   vault-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   cinder-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-conductor-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
-    channel: candidate
   cinder:
     charm: cs:~openstack-charmers/cinder
     num_units: 1
@@ -180,7 +170,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -188,7 +177,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -196,7 +184,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -205,7 +192,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -213,7 +199,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -221,7 +206,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -232,7 +216,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -242,7 +225,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -251,7 +233,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -261,7 +242,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -269,16 +249,13 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -295,20 +272,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate

src/tests/bundles/focal-victoria.yaml

@@ -137,38 +137,28 @@ relations:
 services:
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   keystone-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   glance-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   neutron-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   vault-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   cinder-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-conductor-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
-    channel: candidate
   cinder:
     charm: cs:~openstack-charmers/cinder
     num_units: 1
@@ -180,7 +170,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -188,7 +177,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -196,7 +184,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -205,7 +192,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -213,7 +199,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -221,7 +206,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -232,7 +216,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -242,7 +225,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -251,7 +233,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -261,7 +242,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -269,16 +249,13 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -295,20 +272,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate

src/tests/bundles/focal-wallaby.yaml

@@ -137,38 +137,28 @@ relations:
 services:
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   keystone-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   glance-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   neutron-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   vault-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   cinder-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-conductor-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
-    channel: candidate
   cinder:
     charm: cs:~openstack-charmers/cinder
     num_units: 1
@@ -180,7 +170,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -188,7 +177,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -196,7 +184,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -205,7 +192,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -213,7 +199,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -221,7 +206,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -232,7 +216,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -242,7 +225,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -251,7 +233,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -261,7 +242,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -269,16 +249,13 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -295,20 +272,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate

src/tests/bundles/groovy-victoria.yaml

@@ -137,38 +137,28 @@ relations:
 services:
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   keystone-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   glance-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   neutron-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   vault-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   cinder-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-conductor-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
-    channel: candidate
   cinder:
     charm: cs:~openstack-charmers/cinder
     num_units: 1
@@ -180,7 +170,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -188,7 +177,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -196,7 +184,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -205,7 +192,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -213,7 +199,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -221,7 +206,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -232,7 +216,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -242,7 +225,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -251,7 +233,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -261,7 +242,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -269,16 +249,13 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -295,20 +272,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate

src/tests/bundles/hirsute-wallaby.yaml

@@ -137,38 +137,28 @@ relations:
 services:
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   keystone-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   glance-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   neutron-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   vault-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   cinder-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-api-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   ironic-conductor-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
-    channel: candidate
   cinder:
     charm: cs:~openstack-charmers/cinder
     num_units: 1
@@ -180,7 +170,6 @@ services:
       worker-multiplier: 0.25
     storage:
       block-devices: cinder,50G
-    channel: candidate
   ceph-radosgw:
     charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
@@ -188,7 +177,6 @@ services:
     options:
       source: *source
       namespace-tenants: True
-    channel: candidate
   ceph-mon:
     charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
@@ -196,7 +184,6 @@ services:
     options:
       expected-osd-count: 3
       source: *source
-    channel: candidate
   ceph-osd:
     charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
@@ -205,7 +192,6 @@ services:
       source: *source
     storage:
       osd-devices: 'cinder,30G'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -213,7 +199,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -221,7 +206,6 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -232,7 +216,6 @@ services:
       openstack-origin: *source
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -242,7 +225,6 @@ services:
       enable-isolated-metadata: true
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -251,7 +233,6 @@ services:
       network-manager: Neutron
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   nova-ironic:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -261,7 +242,6 @@ services:
       enable-resize: false
       openstack-origin: *source
       virt-type: ironic
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -269,16 +249,13 @@ services:
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
-    channel: candidate
   hacluster-ironic:
     charm: cs:~openstack-charmers/hacluster
     num_units: 0
-    channel: candidate
   ironic-api:
     charm: ../../../ironic-api
     num_units: 3
@@ -295,20 +272,16 @@ services:
       disable-secure-erase: true
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
-    channel: candidate
   neutron-ironic-agent:
     charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
-    channel: candidate
   vault:
     charm: cs:~openstack-charmers/vault
     num_units: 1
-    channel: candidate