diff --git a/.gitreview b/.gitreview index fb8bb2a..d3c1386 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-placement.git + +defaultbranch=stable/21.01 diff --git a/src/test-requirements.txt b/src/test-requirements.txt index 520681e..cf7632c 100644 --- a/src/test-requirements.txt +++ b/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 diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 05d184b..39c9223 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -41,51 +41,51 @@ relations: - nova-cloud-controller:certificates applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 constraints: mem=1G glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-train keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-train mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 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 openstack-origin: cloud:bionic-train neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-train 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: cloud:bionic-train debug: true nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -103,4 +103,4 @@ applications: debug: true vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index d5fbe55..7bc306f 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -41,29 +41,29 @@ relations: - nova-cloud-controller:certificates applications: rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 constraints: mem=1G glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 constraints: mem=1G options: openstack-origin: cloud:bionic-ussuri keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack openstack-origin: cloud:bionic-ussuri mysql: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 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: manage-neutron-plugin-legacy-mode: true @@ -72,22 +72,22 @@ applications: neutron-security-groups: true openstack-origin: cloud:bionic-ussuri neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-ussuri 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: cloud:bionic-ussuri debug: true nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -105,4 +105,4 @@ applications: debug: true vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 37d45b4..10b38b1 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -26,20 +26,20 @@ machines: applications: keystone-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 glance-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 placement-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 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' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 constraints: mem=1G options: @@ -58,7 +58,7 @@ applications: - '3' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 constraints: mem=1G options: @@ -67,7 +67,7 @@ applications: - '4' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -76,7 +76,7 @@ applications: - '5' neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -88,10 +88,10 @@ applications: - '6' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin @@ -100,7 +100,7 @@ applications: - '7' 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 @@ -110,7 +110,7 @@ applications: - '8' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -134,7 +134,7 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault to: - '11' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index bb17780..73b25c4 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -26,20 +26,20 @@ machines: applications: keystone-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 glance-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 placement-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 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' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 constraints: mem=1G options: @@ -58,7 +58,7 @@ applications: - '3' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 constraints: mem=1G options: @@ -67,7 +67,7 @@ applications: - '4' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -76,7 +76,7 @@ applications: - '5' neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -88,10 +88,10 @@ applications: - '6' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin @@ -100,7 +100,7 @@ applications: - '7' 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 @@ -110,7 +110,7 @@ applications: - '8' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -134,7 +134,7 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault to: - '11' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index c7e7206..d7706eb 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -26,20 +26,20 @@ machines: applications: keystone-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 glance-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 placement-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 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' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 constraints: mem=1G options: @@ -58,7 +58,7 @@ applications: - '3' glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 constraints: mem=1G options: @@ -67,7 +67,7 @@ applications: - '4' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -76,7 +76,7 @@ applications: - '5' neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: openstack-origin: *openstack-origin @@ -88,10 +88,10 @@ applications: - '6' neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin @@ -100,7 +100,7 @@ applications: - '7' 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 @@ -110,7 +110,7 @@ applications: - '8' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=4G options: @@ -134,7 +134,7 @@ applications: vault: num_units: 1 - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault to: - '11' diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 9131674..e97b0a7 100644 --- a/src/wheelhouse.txt +++ b/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 diff --git a/test-requirements.txt b/test-requirements.txt index 3f08524..7765d0e 100644 --- a/test-requirements.txt +++ b/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