Updates for stable branch creation

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. Change-Id: If33c25a08acfd46b7d39c4f7093bbee01287ca73
2 years ago · 4d79120f04
8 changed files with 98 additions and 44 deletions
--- a/.gitreview
+++ b/.gitreview
@ -2,3 +2,5 @@
 host=review.openstack.org
 port=29418
 project=openstack/charm-keystone-saml-mellon.git
+
+defaultbranch=stable/20.05
--- a/src/tests/bundles/bionic-queens-ha.yaml
+++ b/src/tests/bundles/bionic-queens-ha.yaml
@ -83,47 +83,47 @@ relations:
 series: bionic
 services:
  cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
    num_units: 1
    options:
      block-device: None
      glance-api-version: 2
  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
    num_units: 1
  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
    num_units: 1
    options:
      token-provider: 'fernet'
  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
    num_units: 1
    constraints: mem=3072M
    options:
      innodb-buffer-pool-size: 256M
      max-connections: 1000
  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
    num_units: 1
    options:
      flat-network-providers: physnet1
      neutron-security-groups: true
  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
    num_units: 1
    options:
      bridge-mappings: physnet1:br-ex
  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
    num_units: 0
  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
    num_units: 1
    options:
      network-manager: Neutron
  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
    num_units: 2
    options:
      config-flags: default_ephemeral_format=ext4
@ -134,14 +134,14 @@ services:
    charm: cs:ntp
    num_units: 0
  openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
    num_units: 1
  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
    num_units: 1
  vault:
    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
  keystone-saml-mellon:
    series: bionic
    charm: ../../../keystone-saml-mellon
--- a/src/tests/bundles/bionic-queens-smoke-ha.yaml
+++ b/src/tests/bundles/bionic-queens-smoke-ha.yaml
@ -25,11 +25,11 @@ relations:
 applications:
  mysql:
    constraints: mem=3072M
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
    num_units: 1
  keystone:
    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
    num_units: 1
    options:
      token-provider: 'fernet'
@ -49,11 +49,11 @@ applications:
      sp-signing-keyinfo: "./sp-signing-keyinfo.xml"
      sp-private-key: "./sp-private-key.pem"
  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
    num_units: 1
  vault:
    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
  openstack-dashboard:
    num_units: 1
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
--- a/src/tests/bundles/focal-ussuri-ha.yaml
+++ b/src/tests/bundles/focal-ussuri-ha.yaml
@ -32,24 +32,24 @@ 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
  glance-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
  nova-cloud-controller-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
  vault-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

  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
@ -60,7 +60,7 @@ applications:

  cinder:
    num_units: 1
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:~openstack-charmers/cinder
    options:
      openstack-origin: *openstack-origin
      glance-api-version: 2
@ -69,7 +69,7 @@ applications:
      - '3'

  glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:~openstack-charmers/glance
    num_units: 1
    options:
      openstack-origin: *openstack-origin
@ -77,7 +77,7 @@ applications:
      - '4'

  keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
    num_units: 3
    options:
      openstack-origin: *openstack-origin
@ -88,7 +88,7 @@ applications:
      - '7'

  neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:~openstack-charmers/neutron-api
    num_units: 1
    options:
      openstack-origin: *openstack-origin
@ -99,7 +99,7 @@ applications:
      - '8'

  neutron-gateway:
-    charm: cs:~openstack-charmers-next/neutron-gateway
+    charm: cs:~openstack-charmers/neutron-gateway
    num_units: 1
    options:
      openstack-origin: *openstack-origin
@ -108,11 +108,11 @@ applications:
      - '9'

  neutron-openvswitch:
-    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    charm: cs:~openstack-charmers/neutron-openvswitch
    num_units: 0

  nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:~openstack-charmers/nova-cloud-controller
    num_units: 1
    options:
      openstack-origin: *openstack-origin
@ -121,7 +121,7 @@ applications:
      - '10'

  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:~openstack-charmers/nova-compute
    num_units: 2
    options:
      openstack-origin: *openstack-origin
@ -138,7 +138,7 @@ applications:
    num_units: 0

  openstack-dashboard:
-    charm: cs:~openstack-charmers-next/openstack-dashboard
+    charm: cs:~openstack-charmers/openstack-dashboard
    num_units: 3
    options:
      openstack-origin: *openstack-origin
@ -148,7 +148,7 @@ applications:
      - '15'

  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
    num_units: 1
    options:
      source: *openstack-origin
@ -157,12 +157,12 @@ applications:

  vault:
    num_units: 1
-    charm: cs:~openstack-charmers-next/vault
+    charm: cs:~openstack-charmers/vault
    to:
      - '17'

  placement:
-    charm: cs:~openstack-charmers-next/placement
+    charm: cs:~openstack-charmers/placement
    num_units: 1
    options:
      openstack-origin: *openstack-origin
@ -181,13 +181,13 @@ applications:
      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"

  keystone-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
    num_units: 0
    options:
      corosync_transport: unicast
      cluster_count: 3
  openstack-dashboard-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
    num_units: 0
    options:
      corosync_transport: unicast
--- a/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2
+++ b/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2
@ -1 +0,0 @@
-ha.yaml.j2
--- a/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2
+++ b/src/tests/bundles/overlays/bionic-queens-ha.yaml.j2
@ -0,0 +1,26 @@
+relations:
+- - keystone
+  - keystone-hacluster
+- - openstack-dashboard
+  - openstack-dashboard-hacluster
+applications:
+  keystone:
+    num_units: 3
+    options:
+      vip: {{ OS_VIP00 }}
+  openstack-dashboard:
+    num_units: 3
+    options:
+      vip: {{ OS_VIP01 }}
+  keystone-hacluster:
+    charm: cs:~openstack-charmers/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+  openstack-dashboard-hacluster:
+    charm: cs:~openstack-charmers/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
--- a/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2
+++ b/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2
@ -1 +0,0 @@
-ha.yaml.j2
--- a/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2
+++ b/src/tests/bundles/overlays/bionic-queens-smoke-ha.yaml.j2
@ -0,0 +1,26 @@
+relations:
+- - keystone
+  - keystone-hacluster
+- - openstack-dashboard
+  - openstack-dashboard-hacluster
+applications:
+  keystone:
+    num_units: 3
+    options:
+      vip: {{ OS_VIP00 }}
+  openstack-dashboard:
+    num_units: 3
+    options:
+      vip: {{ OS_VIP01 }}
+  keystone-hacluster:
+    charm: cs:~openstack-charmers/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+  openstack-dashboard-hacluster:
+    charm: cs:~openstack-charmers/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
--- a/src/tests/bundles/overlays/ha.yaml.j2
+++ b/src/tests/bundles/overlays/ha.yaml.j2
@ -13,13 +13,13 @@ applications:
    options:
      vip: {{ OS_VIP01 }}
  keystone-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
    num_units: 0
    options:
      corosync_transport: unicast
      cluster_count: 3
  openstack-dashboard-hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: cs:~openstack-charmers/hacluster
    num_units: 0
    options:
      corosync_transport: unicast
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@ -3,3 +3,5 @@ lxml

 jinja2
 psutil
+
+git+https://opendev.org/openstack/charms.openstack.git@stable/20.05#egg=charms.openstack