21.10 - Release

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

Change-Id: I86a91b71f5de66ad3009e62ee10f14e52f4fff6a

tests/bundles/bionic-queens.yaml

@@ -29,7 +29,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -37,7 +36,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -45,7 +43,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -53,7 +50,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -63,7 +59,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -73,13 +68,11 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -87,10 +80,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/bionic-rocky.yaml

@@ -29,7 +29,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -37,7 +36,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -45,7 +43,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -53,7 +50,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -63,7 +59,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -73,13 +68,11 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -87,10 +80,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/bionic-stein.yaml

@@ -29,7 +29,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -37,7 +36,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -45,7 +43,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -53,7 +50,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -63,7 +59,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -73,13 +68,11 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -87,10 +80,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/bionic-train.yaml

@@ -31,7 +31,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -39,7 +38,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -47,7 +45,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -55,7 +52,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -65,7 +61,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -75,7 +70,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -85,7 +79,6 @@ applications:
       debug: "True"
     to:
       - '6'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -93,7 +86,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '7'
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -101,10 +93,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '8'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/bionic-ussuri.yaml

@@ -33,7 +33,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -41,7 +40,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -49,7 +47,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -57,7 +54,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -67,7 +63,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -77,7 +72,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   placement:
     charm: cs:~openstack-charmers/placement
     num_units: 1
@@ -86,7 +80,6 @@ applications:
       debug: "True"
     to:
       - '6'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
@@ -94,7 +87,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '7'
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -104,10 +96,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '8'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/focal-ussuri.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/focal-victoria.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/focal-wallaby.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/focal-xena.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/groovy-victoria.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/hirsute-wallaby.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/impish-xena.yaml

@@ -30,22 +30,16 @@ applications:
 
   heat-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   nova-cloud-controller-mysql-router:
     charm: cs:~openstack-charmers/mysql-router
-    channel: candidate
   placement-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
 
   mysql-innodb-cluster:
     charm: cs:~openstack-charmers/mysql-innodb-cluster
@@ -56,7 +50,6 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: candidate
 
   keystone:
     charm: cs:~openstack-charmers/keystone
@@ -65,7 +58,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
 
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
@@ -74,7 +66,6 @@ applications:
       source: *openstack-origin
     to:
       - '4'
-    channel: candidate
 
   glance:
     charm: cs:~openstack-charmers/glance
@@ -83,7 +74,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '5'
-    channel: candidate
 
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
@@ -94,7 +84,6 @@ applications:
       network-manager: Neutron
     to:
       - '6'
-    channel: candidate
 
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
@@ -105,7 +94,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '7'
-    channel: candidate
 
   placement:
     charm: cs:~openstack-charmers/placement
@@ -115,7 +103,6 @@ applications:
       debug: "True"
     to:
       - '8'
-    channel: candidate
 
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
@@ -124,7 +111,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '9'
-    channel: candidate
 
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
@@ -135,11 +121,9 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '10'
-    channel: candidate
 
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
 
   heat:
     charm: ../../../heat

tests/bundles/trusty-mitaka.yaml

@@ -34,7 +34,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -42,7 +41,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -50,7 +48,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -59,7 +56,6 @@ applications:
       api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -69,7 +65,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/xenial-mitaka.yaml

@@ -28,7 +28,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -36,7 +35,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -44,7 +42,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -52,7 +49,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -61,7 +57,6 @@ applications:
       api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -71,7 +66,6 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/xenial-ocata.yaml

@@ -29,7 +29,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -37,7 +36,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -45,7 +43,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -53,7 +50,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -63,7 +59,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -73,13 +68,11 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -87,10 +80,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/xenial-pike.yaml

@@ -29,7 +29,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -37,7 +36,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -45,7 +43,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -53,7 +50,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -63,7 +59,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -73,13 +68,11 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -87,10 +80,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2

tests/bundles/xenial-queens.yaml

@@ -29,7 +29,6 @@ applications:
       source: *openstack-origin
     to:
       - '0'
-    channel: candidate
   keystone:
     charm: cs:~openstack-charmers/keystone
     num_units: 1
@@ -37,7 +36,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '1'
-    channel: candidate
   rabbitmq-server:
     charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
@@ -45,7 +43,6 @@ applications:
       source: *openstack-origin
     to:
       - '2'
-    channel: candidate
   glance:
     charm: cs:~openstack-charmers/glance
     num_units: 1
@@ -53,7 +50,6 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '3'
-    channel: candidate
   nova-cloud-controller:
     charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
@@ -63,7 +59,6 @@ applications:
       network-manager: Neutron
     to:
       - '4'
-    channel: candidate
   nova-compute:
     charm: cs:~openstack-charmers/nova-compute
     num_units: 1
@@ -73,13 +68,11 @@ applications:
       enable-live-migration: "False"
     to:
       - '5'
-    channel: candidate
   neutron-gateway:
     charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: candidate
   neutron-api:
     charm: cs:~openstack-charmers/neutron-api
     num_units: 1
@@ -87,10 +80,8 @@ applications:
       openstack-origin: *openstack-origin
     to:
       - '6'
-    channel: candidate
   neutron-openvswitch:
     charm: cs:~openstack-charmers/neutron-openvswitch
-    channel: candidate
   heat:
     charm: ../../../heat
     num_units: 2