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: I6e50f5420d18170f474010b1fe6c2b8c56bf6ed8

.gitreview

@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-octavia-dashboard.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-rocky.yaml

@@ -26,33 +26,33 @@ relations:
   - octavia-dashboard:dashboard
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
   mysql:
     constraints: mem=3072M
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
       neutron-security-groups: True
   neutron-openvswitch:
     series: bionic
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
   octavia:
     series: bionic
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
   openstack-dashboard:
      series: bionic
-     charm: cs:~openstack-charmers-next/openstack-dashboard
+     charm: cs:~openstack-charmers/openstack-dashboard
      num_units: 1
      options:
        openstack-origin: cloud:bionic-rocky
@@ -60,5 +60,5 @@ applications:
      series: bionic
      charm: ../../../octavia-dashboard
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1

src/tests/bundles/bionic-stein.yaml

@@ -26,33 +26,33 @@ relations:
   - octavia-dashboard:dashboard
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
   mysql:
     constraints: mem=3072M
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
       neutron-security-groups: True
   neutron-openvswitch:
     series: bionic
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
   octavia:
     series: bionic
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
   openstack-dashboard:
      series: bionic
-     charm: cs:~openstack-charmers-next/openstack-dashboard
+     charm: cs:~openstack-charmers/openstack-dashboard
      num_units: 1
      options:
        openstack-origin: cloud:bionic-stein
@@ -60,5 +60,5 @@ applications:
      series: bionic
      charm: ../../../octavia-dashboard
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1

src/tests/bundles/bionic-train.yaml

@@ -26,33 +26,33 @@ relations:
   - octavia-dashboard:dashboard
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
   mysql:
     constraints: mem=3072M
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
       neutron-security-groups: True
   neutron-openvswitch:
     series: bionic
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
   octavia:
     series: bionic
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
   openstack-dashboard:
      series: bionic
-     charm: cs:~openstack-charmers-next/openstack-dashboard
+     charm: cs:~openstack-charmers/openstack-dashboard
      num_units: 1
      options:
        openstack-origin: cloud:bionic-train
@@ -60,5 +60,5 @@ applications:
      series: bionic
      charm: ../../../octavia-dashboard
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1

src/tests/bundles/bionic-ussuri.yaml

@@ -26,16 +26,16 @@ relations:
   - octavia-dashboard:dashboard
 applications:
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
   mysql:
     constraints: mem=3072M
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -43,20 +43,20 @@ applications:
       openstack-origin: cloud:bionic-ussuri
       neutron-security-groups: True
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
   octavia:
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
   octavia-dashboard:
      charm: ../../../octavia-dashboard
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1

src/tests/bundles/focal-ussuri.yaml

@@ -21,16 +21,16 @@ machines:
 applications:
 
   keystone-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
   octavia-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   openstack-dashboard-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
@@ -40,7 +40,7 @@ applications:
       - '2'
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -48,7 +48,7 @@ applications:
       - '3'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
@@ -56,7 +56,7 @@ applications:
       - '4'
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -67,11 +67,11 @@ applications:
       - '5'
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
 
   octavia:
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -79,7 +79,7 @@ applications:
       - '6'
 
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
     num_units: 1
     options:
       openstack-origin: *openstack-origin

src/tests/bundles/focal-victoria.yaml

@@ -21,16 +21,16 @@ machines:
 applications:
 
   keystone-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
   octavia-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   openstack-dashboard-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
@@ -40,7 +40,7 @@ applications:
       - '2'
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -48,7 +48,7 @@ applications:
       - '3'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
@@ -56,7 +56,7 @@ applications:
       - '4'
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -67,11 +67,11 @@ applications:
       - '5'
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
 
   octavia:
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -79,7 +79,7 @@ applications:
       - '6'
 
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
     num_units: 1
     options:
       openstack-origin: *openstack-origin

src/tests/bundles/groovy-victoria.yaml

@@ -21,16 +21,16 @@ machines:
 applications:
 
   keystone-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
   octavia-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   openstack-dashboard-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
@@ -40,7 +40,7 @@ applications:
       - '2'
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -48,7 +48,7 @@ applications:
       - '3'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
@@ -56,7 +56,7 @@ applications:
       - '4'
 
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
     num_units: 1
     options:
       manage-neutron-plugin-legacy-mode: true
@@ -67,11 +67,11 @@ applications:
       - '5'
 
   neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
     num_units: 0
 
   octavia:
-    charm: cs:~openstack-charmers-next/octavia
+    charm: cs:~openstack-charmers/octavia
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -79,7 +79,7 @@ applications:
       - '6'
 
   openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
     num_units: 1
     options:
       openstack-origin: *openstack-origin

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