Updates for stable branch creation 21.01

Set default branch for git review/gerrit.
Switch tests to stable.
Switch to using stable charm-helpers branch.
Switch to using stable charm.openstack branch.
Switch to using stable zaza branch.
Switch to using stable zaza-openstack-tests branch.

Change-Id: I4cc5c1190dca66254f10ec10f90b75364b115814

.gitreview

@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-ironic-api.git
+
+defaultbranch=stable/21.01

src/test-requirements.txt

@@ -11,5 +11,5 @@ charm-tools>=2.4.4
 keyring<21
 
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack

src/tests/bundles/bionic-train.yaml

@@ -114,7 +114,7 @@ relations:
   - hacluster-ironic
 services:
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -125,21 +125,21 @@ services:
     storage:
       block-devices: cinder,50G
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
@@ -147,21 +147,21 @@ services:
     storage:
       osd-devices: 'cinder,30G'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     constraints: mem=4G
     options:
@@ -169,7 +169,7 @@ services:
       max-connections: 1000
       performance-schema: true
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -179,7 +179,7 @@ services:
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -188,7 +188,7 @@ services:
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
@@ -196,7 +196,7 @@ services:
       openstack-origin: *source
       worker-multiplier: 0.25
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -205,18 +205,18 @@ services:
       openstack-origin: *source
       virt-type: ironic
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: cs:~openstack-charmers/placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
     num_units: 0
   ironic-api:
     charm: ../../../ironic-api
@@ -225,7 +225,7 @@ services:
     options:
       openstack-origin: *source
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: cs:~openstack-charmers/ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -235,15 +235,15 @@ services:
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1

src/tests/bundles/bionic-ussuri.yaml

@@ -114,7 +114,7 @@ relations:
   - hacluster-ironic
 services:
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -125,21 +125,21 @@ services:
     storage:
       block-devices: cinder,50G
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
@@ -147,21 +147,21 @@ services:
     storage:
       osd-devices: 'cinder,30G'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     constraints: mem=4G
     options:
@@ -169,10 +169,10 @@ services:
       max-connections: 1000
       performance-schema: true
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
     num_units: 0
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 3
     constraints: mem=2G
     options:
@@ -182,7 +182,7 @@ services:
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -191,7 +191,7 @@ services:
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
@@ -199,7 +199,7 @@ services:
       openstack-origin: *source
       worker-multiplier: 0.25
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -208,14 +208,14 @@ services:
       openstack-origin: *source
       virt-type: ironic
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: cs:~openstack-charmers/placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
   ironic-api:
@@ -225,7 +225,7 @@ services:
     options:
       openstack-origin: *source
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: cs:~openstack-charmers/ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -235,15 +235,15 @@ services:
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1

src/tests/bundles/focal-ussuri.yaml

@@ -132,31 +132,31 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,21 +167,21 @@ services:
     storage:
       block-devices: cinder,50G
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
@@ -189,21 +189,21 @@ services:
     storage:
       osd-devices: 'cinder,30G'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,7 +213,7 @@ services:
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,7 +222,7 @@ services:
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
@@ -230,7 +230,7 @@ services:
       openstack-origin: *source
       worker-multiplier: 0.25
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,18 +239,18 @@ services:
       openstack-origin: *source
       virt-type: ironic
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: cs:~openstack-charmers/placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
     num_units: 0
   ironic-api:
     charm: ../../../ironic-api
@@ -259,7 +259,7 @@ services:
     options:
       openstack-origin: *source
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: cs:~openstack-charmers/ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,15 +269,15 @@ services:
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1

src/tests/bundles/focal-victoria.yaml

@@ -132,31 +132,31 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,21 +167,21 @@ services:
     storage:
       block-devices: cinder,50G
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
@@ -189,21 +189,21 @@ services:
     storage:
       osd-devices: 'cinder,30G'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,7 +213,7 @@ services:
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,7 +222,7 @@ services:
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
@@ -230,7 +230,7 @@ services:
       openstack-origin: *source
       worker-multiplier: 0.25
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,18 +239,18 @@ services:
       openstack-origin: *source
       virt-type: ironic
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: cs:~openstack-charmers/placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
     num_units: 0
   ironic-api:
     charm: ../../../ironic-api
@@ -259,7 +259,7 @@ services:
     options:
       openstack-origin: *source
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: cs:~openstack-charmers/ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,15 +269,15 @@ services:
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1

src/tests/bundles/groovy-victoria.yaml

@@ -132,31 +132,31 @@ relations:
   - hacluster-ironic
 services:
   nova-cloud-controller-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   neutron-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   placement-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   cinder-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   ironic-api-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   ironic-conductor-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     constraints: mem=4G
     options:
       source: *source
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     constraints: mem=2G
     options:
@@ -167,21 +167,21 @@ services:
     storage:
       block-devices: cinder,50G
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     constraints: mem=2G
     options:
       source: *source
       namespace-tenants: True
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     constraints: mem=2G
     options:
       expected-osd-count: 3
       source: *source
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     constraints: mem=2G
     options:
@@ -189,21 +189,21 @@ services:
     storage:
       osd-devices: 'cinder,30G'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     constraints: mem=2G
     options:
@@ -213,7 +213,7 @@ services:
       manage-neutron-plugin-legacy-mode: false
       worker-multiplier: 0.25
   neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
     num_units: 1
     constraints: mem=2G
     options:
@@ -222,7 +222,7 @@ services:
       enable-metadata-network: true
       bridge-mappings: physnet1:br-ex
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
     constraints: mem=2G
     options:
@@ -230,7 +230,7 @@ services:
       openstack-origin: *source
       worker-multiplier: 0.25
   nova-ironic:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     constraints: mem=2G
     options:
@@ -239,18 +239,18 @@ services:
       openstack-origin: *source
       virt-type: ironic
   placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: cs:~openstack-charmers/placement
     num_units: 1
     constraints: mem=2G
     options:
       openstack-origin: *source
       worker-multiplier: 0.25
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=2G
   hacluster-ironic:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
     num_units: 0
   ironic-api:
     charm: ../../../ironic-api
@@ -259,7 +259,7 @@ services:
     options:
       openstack-origin: *source
   ironic-conductor:
-    charm: cs:~openstack-charmers-next/ironic-conductor
+    charm: cs:~openstack-charmers/ironic-conductor
     num_units: 1
     constraints: mem=2G
     options:
@@ -269,15 +269,15 @@ services:
       use-ipxe: true
       enabled-network-interfaces: "flat, noop"
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
     options:
       bridge-mappings: physnet1:br-ex
   neutron-ironic-agent:
-    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    charm: cs:~openstack-charmers/neutron-api-plugin-ironic
     num_units: 0
     options:
       openstack-origin: *source
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
     num_units: 1

src/wheelhouse.txt

@@ -1,4 +1,4 @@
 
-git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
+git+https://opendev.org/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
 
-git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
+git+https://github.com/juju/charm-helpers.git@stable/21.01#egg=charmhelpers

test-requirements.txt

@@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
 
 nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
 #
 # Revisit for removal / mock improvement:
 netifaces        # vault