From 25e2d38afa2390a40f1241ece0a13332947ca015 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 20 Apr 2023 18:59:16 +0100 Subject: [PATCH] Stable artefacts for stable/2023.1 (antelope) This patch is to lock the stable/2023.1 (antelope release) charms down so that as much as possible. In particular, this patch does: - set the .gitreview to stable/2023.1 - lock zaza and zaza-openstack-tests to stable/antelope branches - for reactive charms Add build.lock files to lock the layers and python modules used to build the charm. - for ops framework charms, extract a pip freeze from the charmcraft container after building the charm to lock the modules used to build the charm. - drop the kinetic bundles if the exist. (Note the updates to tests.yaml is in another batch (topic: antelope-voting) - update the bundles so that they point to the antelope specific channels. e.g. 2023.1/edge for OpenStack charms, 23.03/edge for OVN charms, quincy/edge for Ceph charms and generally, the appropriate LTS Jammy branch for the various support charms. Change-Id: Idf1f24f22557b082c12eaf577835f1659367ceb9 --- .gitreview | 2 + src/build.lock | 182 ++++++++++++++ src/test-requirements.txt | 4 +- src/tests/bundles/jammy-antelope.yaml | 46 ++-- src/tests/bundles/jammy-zed.yaml | 46 ++-- src/tests/bundles/kinetic-zed.yaml | 328 -------------------------- src/tests/bundles/lunar-antelope.yaml | 46 ++-- src/wheelhouse.txt | 4 +- test-requirements.txt | 2 +- 9 files changed, 258 insertions(+), 402 deletions(-) create mode 100644 src/build.lock delete mode 100644 src/tests/bundles/kinetic-zed.yaml diff --git a/.gitreview b/.gitreview index 564fe68..235f88a 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-cinder-backup-swift-proxy.git + +defaultbranch=stable/2023.1 diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..8e07675 --- /dev/null +++ b/src/build.lock @@ -0,0 +1,182 @@ +{ + "locks": [ + { + "type": "layer", + "item": "layer:options", + "url": "https://github.com/juju-solutions/layer-options.git", + "vcs": null, + "branch": "fcdcea4e5de3e1556c24e6704607862d0ba00a56", + "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" + }, + { + "type": "layer", + "item": "layer:basic", + "url": "https://github.com/juju-solutions/layer-basic.git", + "vcs": null, + "branch": "a41b3559d629993d960af65104108f66ab9795a8", + "commit": "a41b3559d629993d960af65104108f66ab9795a8" + }, + { + "type": "layer", + "item": "layer:openstack", + "url": "https://github.com/openstack/charm-layer-openstack", + "vcs": null, + "branch": "1c9e662d78b328c6d4587171ccba08572e8dcf25", + "commit": "1c9e662d78b328c6d4587171ccba08572e8dcf25" + }, + { + "type": "layer", + "item": "cinder-backup-swift-proxy", + "url": null, + "vcs": null, + "branch": null, + "commit": "" + }, + { + "type": "layer", + "item": "interface:tls-certificates", + "url": "https://github.com/juju-solutions/interface-tls-certificates", + "vcs": null, + "branch": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce", + "commit": "61e9f278fc8c8119b1d4810ac39e2275be58e9ce" + }, + { + "type": "layer", + "item": "interface:cinder-backup", + "url": "https://github.com/openstack/charm-interface-cinder-backup.git", + "vcs": null, + "branch": "a1cdf71ad61d4ea5f912d8e0423e887ae761bff7", + "commit": "a1cdf71ad61d4ea5f912d8e0423e887ae761bff7" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "2.1.2" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "5.11.1" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "49.6.0" + }, + { + "type": "python_module", + "package": "Cython", + "vcs": null, + "version": "0.29.34" + }, + { + "type": "python_module", + "package": "poetry_core", + "vcs": null, + "version": "1.5.2" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "6.0" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "6.4.2" + }, + { + "type": "python_module", + "package": "tomli", + "vcs": null, + "version": "2.0.1" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "22.0.4" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "2.3.0" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.40.0" + }, + { + "type": "python_module", + "package": "flit_core", + "vcs": null, + "version": "3.8.0" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.9.5" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + }, + { + "type": "python_module", + "package": "charmhelpers", + "url": "git+https://github.com/juju/charm-helpers.git", + "branch": "stable/antelope", + "version": "b9444c20fdf3dc938790ed208cd1053b60055590", + "vcs": "git" + }, + { + "type": "python_module", + "package": "packaging", + "vcs": null, + "version": "23.1" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.5.2" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "3.1.2" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "stable/antelope", + "version": "7a589883545284e0a6303c7977402afb38e99d46", + "vcs": "git" + } + ] +} \ No newline at end of file diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e771023..e72aeff 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -5,5 +5,5 @@ # # 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/antelope#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/antelope#egg=zaza.openstack diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml index 29ce822..b3d0348 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-antelope.yaml @@ -41,30 +41,30 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 options: - source: *openstack-origin + source: distro to: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-mon: charm: ch:ceph-mon @@ -76,7 +76,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: quincy/edge ceph-osd: charm: ch:ceph-osd @@ -90,7 +90,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: quincy/edge cinder: charm: ch:cinder @@ -101,12 +101,12 @@ applications: glance-api-version: 2 to: - '12' - channel: latest/edge + channel: 2023.1/edge cinder-ceph: charm: ch:cinder-ceph num_units: 0 - channel: latest/edge + channel: 2023.1/edge cinder-backup-swift-proxy: charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm @@ -126,7 +126,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2023.1/edge keystone: charm: ch:keystone @@ -135,7 +135,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2023.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -144,14 +144,14 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2023.1/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '16' - channel: latest/edge + channel: 3.9/edge nova-compute: charm: ch:nova-compute @@ -160,7 +160,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2023.1/edge placement: charm: ch:placement @@ -170,23 +170,23 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: latest/edge + channel: 2023.1/edge # external swift swift-keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge swift-mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 options: - source: *openstack-origin + source: distro to: - '3' - '4' - '5' - channel: latest/edge + channel: 8.0/edge swift-keystone: charm: ch:keystone @@ -197,7 +197,7 @@ applications: preferred-api-version: 3 to: - '19' - channel: latest/edge + channel: 2023.1/edge swift-proxy: @@ -209,7 +209,7 @@ applications: replicas: 1 to: - '20' - channel: latest/edge + channel: 2023.1/edge swift-storage: charm: ch:swift-storage @@ -221,7 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' - channel: latest/edge + channel: 2023.1/edge relations: diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml index 8604a2f..5b1782a 100644 --- a/src/tests/bundles/jammy-zed.yaml +++ b/src/tests/bundles/jammy-zed.yaml @@ -41,30 +41,30 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 options: - source: *openstack-origin + source: distro to: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-mon: charm: ch:ceph-mon @@ -76,7 +76,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: quincy/edge ceph-osd: charm: ch:ceph-osd @@ -90,7 +90,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: quincy/edge cinder: charm: ch:cinder @@ -101,12 +101,12 @@ applications: glance-api-version: 2 to: - '12' - channel: latest/edge + channel: 2023.1/edge cinder-ceph: charm: ch:cinder-ceph num_units: 0 - channel: latest/edge + channel: 2023.1/edge cinder-backup-swift-proxy: charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm @@ -126,7 +126,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2023.1/edge keystone: charm: ch:keystone @@ -135,7 +135,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2023.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -144,14 +144,14 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2023.1/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '16' - channel: latest/edge + channel: 3.9/edge nova-compute: charm: ch:nova-compute @@ -160,7 +160,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2023.1/edge placement: charm: ch:placement @@ -170,23 +170,23 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: latest/edge + channel: 2023.1/edge # external swift swift-keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge swift-mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 options: - source: *openstack-origin + source: distro to: - '3' - '4' - '5' - channel: latest/edge + channel: 8.0/edge swift-keystone: charm: ch:keystone @@ -197,7 +197,7 @@ applications: preferred-api-version: 3 to: - '19' - channel: latest/edge + channel: 2023.1/edge swift-proxy: @@ -209,7 +209,7 @@ applications: replicas: 1 to: - '20' - channel: latest/edge + channel: 2023.1/edge swift-storage: charm: ch:swift-storage @@ -221,7 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' - channel: latest/edge + channel: 2023.1/edge relations: diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index 7924325..0000000 --- a/src/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,328 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -local_overlay_enabled: False - -series: kinetic - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - constraints: mem=3072M - '4': - constraints: mem=3072M - '5': - constraints: mem=3072M - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - '19': - '20': - '21': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - channel: latest/edge - - ceph-mon: - charm: ch:ceph-mon - num_units: 3 - options: - source: *openstack-origin - monitor-count: '3' - to: - - '6' - - '7' - - '8' - channel: latest/edge - - ceph-osd: - charm: ch:ceph-osd - num_units: 3 - storage: - osd-devices: 'cinder,10G' - options: - source: *openstack-origin - osd-devices: '/dev/test-non-existent' - to: - - '9' - - '10' - - '11' - channel: latest/edge - - cinder: - charm: ch:cinder - num_units: 1 - options: - block-device: None - openstack-origin: *openstack-origin - glance-api-version: 2 - to: - - '12' - channel: latest/edge - - cinder-ceph: - charm: ch:cinder-ceph - num_units: 0 - channel: latest/edge - - cinder-backup-swift-proxy: - charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm - num_units: 0 - options: - auth-version: 3 - swift-user: admin - swift-key: openstack - user-domain: admin_domain - project-domain: admin_domain - project-name: admin - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '13' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '16' - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - to: - - '18' - channel: latest/edge - -# external swift - swift-keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - - swift-mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '3' - - '4' - - '5' - channel: latest/edge - - swift-keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - preferred-api-version: 3 - to: - - '19' - channel: latest/edge - - - swift-proxy: - charm: ch:swift-proxy - num_units: 1 - options: - openstack-origin: *openstack-origin - zone-assignment: manual - replicas: 1 - to: - - '20' - channel: latest/edge - - swift-storage: - charm: ch:swift-storage - num_units: 1 - options: - openstack-origin: *openstack-origin - zone: 1 - storage: - block-devices: 'cinder,10G' - to: - - '21' - channel: latest/edge - - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder' - - 'cinder-backup-swift-proxy' - - - - 'ceph-mon:client' - - 'nova-compute:ceph' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ceph-mon:client' - - 'cinder-ceph:ceph' - - - - 'ceph-mon:client' - - 'glance:ceph' - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - -# external swift service - - - 'swift-keystone:shared-db' - - 'swift-keystone-mysql-router:shared-db' - - - 'swift-keystone-mysql-router:db-router' - - 'swift-mysql-innodb-cluster:db-router' - - - - 'swift-proxy:identity-service' - - 'swift-keystone:identity-service' - - - - 'swift-proxy:swift-storage' - - 'swift-storage:swift-storage' - diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/lunar-antelope.yaml index b97dc11..d22fe75 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/lunar-antelope.yaml @@ -41,30 +41,30 @@ applications: keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge glance-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge nova-cloud-controller-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge cinder-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge placement-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 options: - source: *openstack-origin + source: distro to: - '0' - '1' - '2' - channel: latest/edge + channel: 8.0/edge ceph-mon: charm: ch:ceph-mon @@ -76,7 +76,7 @@ applications: - '6' - '7' - '8' - channel: latest/edge + channel: quincy/edge ceph-osd: charm: ch:ceph-osd @@ -90,7 +90,7 @@ applications: - '9' - '10' - '11' - channel: latest/edge + channel: quincy/edge cinder: charm: ch:cinder @@ -101,12 +101,12 @@ applications: glance-api-version: 2 to: - '12' - channel: latest/edge + channel: 2023.1/edge cinder-ceph: charm: ch:cinder-ceph num_units: 0 - channel: latest/edge + channel: 2023.1/edge cinder-backup-swift-proxy: charm: ../../../cinder-backup-swift-proxy_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm @@ -126,7 +126,7 @@ applications: openstack-origin: *openstack-origin to: - '13' - channel: latest/edge + channel: 2023.1/edge keystone: charm: ch:keystone @@ -135,7 +135,7 @@ applications: openstack-origin: *openstack-origin to: - '14' - channel: latest/edge + channel: 2023.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -144,14 +144,14 @@ applications: openstack-origin: *openstack-origin to: - '15' - channel: latest/edge + channel: 2023.1/edge rabbitmq-server: charm: ch:rabbitmq-server num_units: 1 to: - '16' - channel: latest/edge + channel: 3.9/edge nova-compute: charm: ch:nova-compute @@ -160,7 +160,7 @@ applications: openstack-origin: *openstack-origin to: - '17' - channel: latest/edge + channel: 2023.1/edge placement: charm: ch:placement @@ -170,23 +170,23 @@ applications: openstack-origin: *openstack-origin to: - '18' - channel: latest/edge + channel: 2023.1/edge # external swift swift-keystone-mysql-router: charm: ch:mysql-router - channel: latest/edge + channel: 8.0/edge swift-mysql-innodb-cluster: charm: ch:mysql-innodb-cluster num_units: 3 options: - source: *openstack-origin + source: distro to: - '3' - '4' - '5' - channel: latest/edge + channel: 8.0/edge swift-keystone: charm: ch:keystone @@ -197,7 +197,7 @@ applications: preferred-api-version: 3 to: - '19' - channel: latest/edge + channel: 2023.1/edge swift-proxy: @@ -209,7 +209,7 @@ applications: replicas: 1 to: - '20' - channel: latest/edge + channel: 2023.1/edge swift-storage: charm: ch:swift-storage @@ -221,7 +221,7 @@ applications: block-devices: 'cinder,10G' to: - '21' - channel: latest/edge + channel: 2023.1/edge relations: diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index b0e2cf2..417ec7a 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,5 +1,5 @@ setuptools < 50.0 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/antelope#egg=charms.openstack -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/antelope#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index a7936e6..400e7ee 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -19,7 +19,7 @@ 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/antelope#egg=charms.openstack # # Revisit for removal / mock improvement: #