Updates for stable branch creation

Set default branch for git review/gerrit.

Update test bundles to point to openstack-charmers.

Change-Id: I1080acc3edff2ad7be13808a794000145b429f55

.gitreview

@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-ceph-proxy
+
+defaultbranch=stable/21.04

tests/bundles/bionic-queens.yaml

@@ -1,12 +1,12 @@
 series: bionic
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -14,10 +14,10 @@ applications:
     charm: 'ceph-proxy'
     num_units: 1
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       block-device: ""
@@ -26,21 +26,21 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     constraints: mem=1024
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       dataset-size: 50%
@@ -50,7 +50,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
 relations:

tests/bundles/bionic-rocky.yaml

@@ -1,13 +1,13 @@
 series: bionic
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:bionic-rocky
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:bionic-rocky
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: cloud:bionic-rocky
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
@@ -34,27 +34,27 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:bionic-rocky
@@ -65,7 +65,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/bionic-stein.yaml

@@ -1,13 +1,13 @@
 series: bionic
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:bionic-stein
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:bionic-stein
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: cloud:bionic-stein
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
@@ -34,27 +34,27 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:bionic-stein
@@ -65,7 +65,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/bionic-train.yaml

@@ -1,13 +1,13 @@
 series: bionic
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:bionic-train
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:bionic-train
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: cloud:bionic-train
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
@@ -34,27 +34,27 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:bionic-train
@@ -65,7 +65,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/bionic-ussuri.yaml

@@ -1,13 +1,13 @@
 series: bionic
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:bionic-ussuri
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:bionic-ussuri
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: cloud:bionic-ussuri
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
@@ -34,28 +34,28 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
       admin-password: openstack
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:bionic-ussuri
@@ -66,7 +66,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/focal-ussuri-ec.yaml

@@ -32,14 +32,14 @@ machines:
 applications:
 
   cinder-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
   keystone-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
     options:
       source: *openstack-origin
@@ -49,7 +49,7 @@ applications:
       - '2'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -60,7 +60,7 @@ applications:
       - '5'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 6
     storage:
       osd-devices: 10G
@@ -83,7 +83,7 @@ applications:
       - '9'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
@@ -94,7 +94,7 @@ applications:
       - '10'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -107,7 +107,7 @@ applications:
       - '11'
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:~openstack-charmers/cinder-ceph
     options:
       restrict-ceph-pools: True
       pool-type: erasure-coded
@@ -117,7 +117,7 @@ applications:
       ec-profile-locality: 3
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -127,7 +127,7 @@ applications:
       - '12'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=1024
     options:
@@ -136,7 +136,7 @@ applications:
       - '13'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -148,7 +148,7 @@ applications:
       - '14'
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin

tests/bundles/focal-ussuri.yaml

@@ -29,14 +29,14 @@ machines:
 applications:
 
   cinder-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
   keystone-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
     options:
       source: *openstack-origin
@@ -46,7 +46,7 @@ applications:
       - '2'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -57,7 +57,7 @@ applications:
       - '5'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 10G
@@ -77,7 +77,7 @@ applications:
       - '9'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
@@ -85,7 +85,7 @@ applications:
       - '10'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -98,12 +98,12 @@ applications:
       - '11'
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:~openstack-charmers/cinder-ceph
     options:
       restrict-ceph-pools: True
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -113,7 +113,7 @@ applications:
       - '12'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=1024
     options:
@@ -122,7 +122,7 @@ applications:
       - '13'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -130,7 +130,7 @@ applications:
       - '14'
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin

tests/bundles/focal-victoria-ec.yaml

@@ -32,14 +32,14 @@ machines:
 applications:
 
   cinder-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
   keystone-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
     options:
       source: *openstack-origin
@@ -49,7 +49,7 @@ applications:
       - '2'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -60,7 +60,7 @@ applications:
       - '5'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 6
     storage:
       osd-devices: 10G
@@ -83,7 +83,7 @@ applications:
       - '9'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
@@ -94,7 +94,7 @@ applications:
       - '10'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -107,7 +107,7 @@ applications:
       - '11'
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:~openstack-charmers/cinder-ceph
     options:
       restrict-ceph-pools: True
       pool-type: erasure-coded
@@ -117,7 +117,7 @@ applications:
       ec-profile-locality: 3
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -127,7 +127,7 @@ applications:
       - '12'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=1024
     options:
@@ -136,7 +136,7 @@ applications:
       - '13'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -148,7 +148,7 @@ applications:
       - '14'
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin

tests/bundles/focal-victoria.yaml

@@ -29,14 +29,14 @@ machines:
 applications:
 
   cinder-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
   keystone-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
     options:
       source: *openstack-origin
@@ -46,7 +46,7 @@ applications:
       - '2'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -57,7 +57,7 @@ applications:
       - '5'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 10G
@@ -77,7 +77,7 @@ applications:
       - '9'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
@@ -85,7 +85,7 @@ applications:
       - '10'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -98,12 +98,12 @@ applications:
       - '11'
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:~openstack-charmers/cinder-ceph
     options:
       restrict-ceph-pools: True
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -113,7 +113,7 @@ applications:
       - '12'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=1024
     options:
@@ -122,7 +122,7 @@ applications:
       - '13'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -130,7 +130,7 @@ applications:
       - '14'
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin

tests/bundles/groovy-victoria-ec.yaml

@@ -32,14 +32,14 @@ machines:
 applications:
 
   cinder-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
   keystone-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
     options:
       source: *openstack-origin
@@ -49,7 +49,7 @@ applications:
       - '2'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -60,7 +60,7 @@ applications:
       - '5'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 6
     storage:
       osd-devices: 10G
@@ -83,7 +83,7 @@ applications:
       - '9'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
@@ -94,7 +94,7 @@ applications:
       - '10'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -107,7 +107,7 @@ applications:
       - '11'
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:~openstack-charmers/cinder-ceph
     options:
       restrict-ceph-pools: True
       pool-type: erasure-coded
@@ -117,7 +117,7 @@ applications:
       ec-profile-locality: 3
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -127,7 +127,7 @@ applications:
       - '12'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=1024
     options:
@@ -136,7 +136,7 @@ applications:
       - '13'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -148,7 +148,7 @@ applications:
       - '14'
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin

tests/bundles/groovy-victoria.yaml

@@ -29,14 +29,14 @@ machines:
 applications:
 
   cinder-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
   keystone-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
     options:
       source: *openstack-origin
@@ -46,7 +46,7 @@ applications:
       - '2'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -57,7 +57,7 @@ applications:
       - '5'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 10G
@@ -77,7 +77,7 @@ applications:
       - '9'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: cs:~openstack-charmers/ceph-radosgw
     num_units: 1
     options:
       source: *openstack-origin
@@ -85,7 +85,7 @@ applications:
       - '10'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -98,12 +98,12 @@ applications:
       - '11'
 
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:~openstack-charmers/cinder-ceph
     options:
       restrict-ceph-pools: True
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -113,7 +113,7 @@ applications:
       - '12'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     constraints: mem=1024
     options:
@@ -122,7 +122,7 @@ applications:
       - '13'
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -130,7 +130,7 @@ applications:
       - '14'
 
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: *openstack-origin

tests/bundles/trusty-mitaka.yaml

@@ -1,13 +1,13 @@
 series: trusty
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:trusty-mitaka
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:trusty-mitaka
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: trusty-mitaka
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
@@ -34,26 +34,26 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
@@ -70,7 +70,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/xenial-mitaka.yaml

@@ -1,12 +1,12 @@
 series: xenial
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -16,11 +16,11 @@ applications:
     num_units: 1
     options:
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       block-device: ""
@@ -29,21 +29,21 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     constraints: mem=1024
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       dataset-size: 50%
@@ -53,7 +53,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
 relations:

tests/bundles/xenial-ocata.yaml

@@ -1,13 +1,13 @@
 series: xenial
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:xenial-ocata
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:xenial-ocata
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: xenial-ocata
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
@@ -34,27 +34,27 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:xenial-ocata
@@ -65,7 +65,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/xenial-pike.yaml

@@ -1,13 +1,13 @@
 series: bionic
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:xenial-pike
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:xenial-pike
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: xenial-pike
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
@@ -34,27 +34,27 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:xenial-pike
@@ -65,7 +65,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options:

tests/bundles/xenial-queens.yaml

@@ -1,13 +1,13 @@
 series: xenial
 applications:
   ceph-mon:
-    charm: 'cs:~openstack-charmers-next/ceph-mon'
+    charm: 'cs:~openstack-charmers/ceph-mon'
     num_units: 3
     options:
       expected-osd-count: 3
       source: cloud:xenial-queens
   ceph-osd:
-    charm: 'cs:~openstack-charmers-next/ceph-osd'
+    charm: 'cs:~openstack-charmers/ceph-osd'
     num_units: 3
     storage:
       osd-devices: 10G
@@ -19,12 +19,12 @@ applications:
     options:
       source: cloud:xenial-queens
   ceph-radosgw:
-    charm: 'cs:~openstack-charmers-next/ceph-radosgw'
+    charm: 'cs:~openstack-charmers/ceph-radosgw'
     num_units: 1
     options:
       source: cloud:xenial-queens
   cinder:
-    charm: 'cs:~openstack-charmers-next/cinder'
+    charm: 'cs:~openstack-charmers/cinder'
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
@@ -34,27 +34,27 @@ applications:
       overwrite: "false"
     constraints: mem=2048
   cinder-ceph:
-    charm: 'cs:~openstack-charmers-next/cinder-ceph'
+    charm: 'cs:~openstack-charmers/cinder-ceph'
     options:
       restrict-ceph-pools: True
   keystone:
-    charm: 'cs:~openstack-charmers-next/keystone'
+    charm: 'cs:~openstack-charmers/keystone'
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
     constraints: mem=1024
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
   percona-cluster:
-    charm: 'cs:~openstack-charmers-next/percona-cluster'
+    charm: 'cs:~openstack-charmers/percona-cluster'
     num_units: 1
     options:
       source: cloud:xenial-queens
@@ -65,7 +65,7 @@ applications:
       sst-password: ChangeMe123
     constraints: mem=4096
   rabbitmq-server:
-    charm: 'cs:~openstack-charmers-next/rabbitmq-server'
+    charm: 'cs:~openstack-charmers/rabbitmq-server'
     num_units: 1
     constraints: mem=1024
     options: