From 64e57cba3a34865feca94c85e1690b81de665d65 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 3 May 2021 12:26:13 +0200 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Update test bundles to point to openstack-charmers. Change-Id: Ia028f491db110b540429f70fac3b64f478d851a2 --- .gitreview | 2 ++ src/tests/bundles/focal-full.yaml | 24 +++++++++++----------- src/tests/bundles/focal.yaml | 6 +++--- src/tests/bundles/groovy-full.yaml | 24 +++++++++++----------- src/tests/bundles/groovy.yaml | 6 +++--- src/tests/bundles/overlays/full-ha.yaml.j2 | 4 ++-- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/.gitreview b/.gitreview index e1c8bd6..ff71178 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-mysql-router.git + +defaultbranch=stable/21.04 diff --git a/src/tests/bundles/focal-full.yaml b/src/tests/bundles/focal-full.yaml index ab8cb37..8a6d85d 100644 --- a/src/tests/bundles/focal-full.yaml +++ b/src/tests/bundles/focal-full.yaml @@ -17,32 +17,32 @@ applications: vault-mysql-router: charm: ../../../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 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: @@ -50,20 +50,20 @@ applications: neutron-security-groups: true openstack-origin: *openstack-origin glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin 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 openstack-origin: *openstack-origin ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -72,7 +72,7 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/focal.yaml b/src/tests/bundles/focal.yaml index 2d60a98..ba28fb6 100644 --- a/src/tests/bundles/focal.yaml +++ b/src/tests/bundles/focal.yaml @@ -7,13 +7,13 @@ applications: series: focal charm: ../../../mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - vault:certificates diff --git a/src/tests/bundles/groovy-full.yaml b/src/tests/bundles/groovy-full.yaml index 95c3084..96942f8 100644 --- a/src/tests/bundles/groovy-full.yaml +++ b/src/tests/bundles/groovy-full.yaml @@ -17,32 +17,32 @@ applications: vault-mysql-router: charm: ../../../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 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: @@ -50,20 +50,20 @@ applications: neutron-security-groups: true openstack-origin: *openstack-origin glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin 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 openstack-origin: *openstack-origin ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -72,7 +72,7 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/groovy.yaml b/src/tests/bundles/groovy.yaml index e5162d3..3cbf70c 100644 --- a/src/tests/bundles/groovy.yaml +++ b/src/tests/bundles/groovy.yaml @@ -7,13 +7,13 @@ applications: series: groovy charm: ../../../mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - vault:certificates diff --git a/src/tests/bundles/overlays/full-ha.yaml.j2 b/src/tests/bundles/overlays/full-ha.yaml.j2 index 2d8fd26..aba8fe4 100644 --- a/src/tests/bundles/overlays/full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/full-ha.yaml.j2 @@ -8,9 +8,9 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"]