diff --git a/.gitreview b/.gitreview index 714780d..d52f7b7 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-barbican-vault.git + +defaultbranch=stable/20.08 diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 1c9df3f..f4a5ffd 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -16,16 +16,16 @@ relations: - barbican-vault:secrets-storage applications: mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky barbican: series: bionic - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: cloud:bionic-rocky @@ -34,8 +34,8 @@ applications: charm: ../../../barbican-vault num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 1bff192..0705803 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -16,16 +16,16 @@ relations: - barbican-vault:secrets-storage applications: mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein barbican: series: bionic - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: cloud:bionic-stein @@ -34,8 +34,8 @@ applications: charm: ../../../barbican-vault num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 0023391..f41045f 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -16,16 +16,16 @@ relations: - barbican-vault:secrets-storage applications: mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train barbican: series: bionic - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: cloud:bionic-train @@ -34,8 +34,8 @@ applications: charm: ../../../barbican-vault num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index def4574..f67ce3f 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -16,15 +16,15 @@ relations: - barbican-vault:secrets-storage applications: mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri barbican: - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: cloud:bionic-ussuri @@ -32,8 +32,8 @@ applications: charm: ../../../barbican-vault num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index b9a1604..c750d52 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -22,14 +22,14 @@ machines: applications: keystone-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 barbican-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 @@ -39,7 +39,7 @@ applications: - '2' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -47,7 +47,7 @@ applications: - '3' barbican: - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -61,7 +61,7 @@ applications: num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -69,7 +69,7 @@ applications: - '7' vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '8' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index d2e58d0..a166f32 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -22,14 +22,14 @@ machines: applications: keystone-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 barbican-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 @@ -39,7 +39,7 @@ applications: - '2' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -47,7 +47,7 @@ applications: - '3' barbican: - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -61,7 +61,7 @@ applications: num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -69,7 +69,7 @@ applications: - '7' vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '8' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index 3a52cb4..2548e15 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -22,14 +22,14 @@ machines: applications: keystone-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 barbican-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 @@ -39,7 +39,7 @@ applications: - '2' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -47,7 +47,7 @@ applications: - '3' barbican: - charm: cs:~openstack-charmers-next/barbican + charm: cs:~openstack-charmers/barbican num_units: 3 options: openstack-origin: *openstack-origin @@ -61,7 +61,7 @@ applications: num_units: 0 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -69,7 +69,7 @@ applications: - '7' vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 to: - '8' diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 index a9e5059..a5b647e 100644 --- a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 +++ b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 @@ -3,7 +3,7 @@ applications: options: vip: '{{ TEST_VIP01 }}' barbican-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster relations: - - barbican:ha - barbican-hacluster:ha diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index af15b6e..52d1877 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,2 +1,6 @@ # Pin hvac for a consistent response type hvac==0.10.1 + +git+https://opendev.org/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack + +git+https://github.com/juju/charm-helpers.git@stable/20.08#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 0ab97f6..0c5b6cd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,7 @@ charms.reactive mock>=1.2 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/20.08#egg=charms.openstack # # Revisit for removal / mock improvement: netifaces # vault