From c229746c14ea2ecea1d4827fe5b402ecaa0978fd Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 11 Mar 2022 17:37:25 +0000 Subject: [PATCH] Migration ceph stable charms to charmhub - pacific This is the stable/pacific branch of the ceph charms. It tests against focal-ussuri (validates octopus) and focal-wallaby (validates pacific). Change-Id: Ie7df5a0be5cfaffa764c76435bc1583561ef54d4 --- .gitignore | 1 + .gitreview | 2 +- LICENSE | 202 ++++++++++++++++++++++++ build-requirements.txt | 7 + charm-helpers-hooks.yaml | 2 +- charmcraft.yaml | 35 +++++ config.yaml | 2 +- metadata.yaml | 5 - osci.yaml | 45 ++---- rename.sh | 13 ++ test-requirements.txt | 5 +- tests/bundles/bionic-queens.yaml | 82 ---------- tests/bundles/bionic-rocky.yaml | 99 ------------ tests/bundles/bionic-stein.yaml | 99 ------------ tests/bundles/bionic-train.yaml | 99 ------------ tests/bundles/bionic-ussuri.yaml | 100 ------------ tests/bundles/focal-ussuri-ec.yaml | 43 ++++-- tests/bundles/focal-ussuri.yaml | 43 ++++-- tests/bundles/focal-victoria-ec.yaml | 215 -------------------------- tests/bundles/focal-victoria.yaml | 186 ---------------------- tests/bundles/focal-wallaby-ec.yaml | 43 ++++-- tests/bundles/focal-wallaby.yaml | 43 ++++-- tests/bundles/groovy-victoria-ec.yaml | 215 -------------------------- tests/bundles/groovy-victoria.yaml | 186 ---------------------- tests/bundles/hirsute-wallaby-ec.yaml | 215 -------------------------- tests/bundles/hirsute-wallaby.yaml | 186 ---------------------- tests/bundles/trusty-mitaka.yaml | 115 -------------- tests/bundles/xenial-mitaka.yaml | 85 ---------- tests/bundles/xenial-ocata.yaml | 99 ------------ tests/bundles/xenial-pike.yaml | 99 ------------ tests/bundles/xenial-queens.yaml | 99 ------------ tests/tests.yaml | 32 +--- tox.ini | 17 +- 33 files changed, 414 insertions(+), 2305 deletions(-) create mode 100644 LICENSE create mode 100644 build-requirements.txt create mode 100644 charmcraft.yaml create mode 100755 rename.sh delete mode 100644 tests/bundles/bionic-queens.yaml delete mode 100644 tests/bundles/bionic-rocky.yaml delete mode 100644 tests/bundles/bionic-stein.yaml delete mode 100644 tests/bundles/bionic-train.yaml delete mode 100644 tests/bundles/bionic-ussuri.yaml delete mode 100644 tests/bundles/focal-victoria-ec.yaml delete mode 100644 tests/bundles/focal-victoria.yaml delete mode 100644 tests/bundles/groovy-victoria-ec.yaml delete mode 100644 tests/bundles/groovy-victoria.yaml delete mode 100644 tests/bundles/hirsute-wallaby-ec.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml delete mode 100644 tests/bundles/trusty-mitaka.yaml delete mode 100644 tests/bundles/xenial-mitaka.yaml delete mode 100644 tests/bundles/xenial-ocata.yaml delete mode 100644 tests/bundles/xenial-pike.yaml delete mode 100644 tests/bundles/xenial-queens.yaml diff --git a/.gitignore b/.gitignore index 9e552b1..d41079d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bin .unit-state.db .stestr __pycache__ +*.charm diff --git a/.gitreview b/.gitreview index 7036acb..909c38f 100644 --- a/.gitreview +++ b/.gitreview @@ -3,4 +3,4 @@ host=review.opendev.org port=29418 project=openstack/charm-ceph-proxy -defaultbranch=stable/21.10 +defaultbranch=stable/pacific diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 0000000..b6d2452 --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,7 @@ +# NOTES(lourot): +# * We don't install charmcraft via pip anymore because it anyway spins up a +# container and scp the system's charmcraft snap inside it. So the charmcraft +# snap is necessary on the system anyway. +# * `tox -e build` successfully validated with charmcraft 1.2.1 + +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index fb87e1c..d64cec0 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers@stable/21.10 +repo: https://github.com/juju/charm-helpers@stable/wallaby destination: charmhelpers include: - core diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..db82a7b --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,35 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - charmhelpers/* + - files/* + - hooks/* + - lib/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - build-on: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 + - s390x + - ppc64el + - arm64 + run-on: + - name: ubuntu + channel: "20.04" diff --git a/config.yaml b/config.yaml index 533dac6..90966ea 100644 --- a/config.yaml +++ b/config.yaml @@ -10,7 +10,7 @@ options: Setting this to True will allow supporting services to log to syslog. source: type: string - default: "" + default: cloud:focal-victoria description: | Repository from which to install. May be one of the following: distro (default), ppa:somecustom/ppa, a deb url sources entry, diff --git a/metadata.yaml b/metadata.yaml index 5c25af5..8bbaf27 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -10,12 +10,7 @@ tags: - file-servers - misc series: -- xenial -- bionic - focal -- groovy -- hirsute -- impish extra-bindings: public: cluster: diff --git a/osci.yaml b/osci.yaml index 4477240..3c0940c 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,50 +1,31 @@ - project: templates: - - charm-unit-jobs + - charm-unit-jobs-py38 check: jobs: - - bionic-queens # luminous - - bionic-stein - - bionic-train - - bionic-ussuri - focal-ussuri - focal-ussuri-ec - - focal-victoria - - focal-victoria-ec - focal-wallaby - focal-wallaby-ec - - groovy-victoria - - groovy-victoria-ec - - hirsute-wallaby - - hirsute-wallaby-ec + vars: + needs_charm_build: true + charm_build_name: ceph-proxy + build_type: charmcraft - job: name: focal-ussuri-ec parent: func-target - dependencies: &smoke-jobs - - bionic-ussuri + dependencies: + - charm-build + - tox-py38 + - osci-lint vars: tox_extra_args: erasure-coded:focal-ussuri-ec -- job: - name: focal-victoria-ec - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: erasure-coded:focal-victoria-ec - job: name: focal-wallaby-ec parent: func-target - dependencies: *smoke-jobs + dependencies: + - charm-build + - tox-py38 + - osci-lint vars: tox_extra_args: erasure-coded:focal-wallaby-ec -- job: - name: groovy-victoria-ec - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: erasure-coded:groovy-victoria-ec -- job: - name: hirsute-wallaby-ec - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: erasure-coded:hirsute-wallaby-ec diff --git a/rename.sh b/rename.sh new file mode 100755 index 0000000..d0c35c9 --- /dev/null +++ b/rename.sh @@ -0,0 +1,13 @@ +#!/bin/bash +charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}') +echo "renaming ${charm}_*.charm to ${charm}.charm" +echo -n "pwd: " +pwd +ls -al +echo "Removing bad downloaded charm maybe?" +if [[ -e "${charm}.charm" ]]; +then + rm "${charm}.charm" +fi +echo "Renaming charm here." +mv ${charm}_*.charm ${charm}.charm diff --git a/test-requirements.txt b/test-requirements.txt index 0a7e94a..359d4f8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,7 @@ # requirements. They are intertwined. Also, Zaza itself should specify # all of its own requirements and if it doesn't, fix it there. # +pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 @@ -37,8 +38,8 @@ oslo.utils<=3.41.0;python_version<'3.6' coverage>=4.5.2 pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) -git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack # Needed for charm-glance: git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 044103d..0000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,82 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - constraints: mem=1024 - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 04816b0..0000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,99 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-rocky - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:bionic-rocky - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:bionic-rocky - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: cloud:bionic-rocky - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:bionic-rocky - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:bionic-rocky -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 8158a4c..0000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,99 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-stein - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:bionic-stein - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:bionic-stein - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: cloud:bionic-stein - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:bionic-stein - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:bionic-stein -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 4979f13..0000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,99 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-train - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:bionic-train - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:bionic-train - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: cloud:bionic-train - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:bionic-train - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:bionic-train - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-train - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:bionic-train - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:bionic-train -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 00d047f..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:bionic-ussuri - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:bionic-ussuri - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:bionic-ussuri - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: cloud:bionic-ussuri - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - admin-password: openstack - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:bionic-ussuri - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:bionic-ussuri -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-ussuri-ec.yaml b/tests/bundles/focal-ussuri-ec.yaml index 2ed4fee..08d016c 100644 --- a/tests/bundles/focal-ussuri-ec.yaml +++ b/tests/bundles/focal-ussuri-ec.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin distro @@ -32,14 +34,17 @@ machines: applications: cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -47,9 +52,10 @@ applications: - '0' - '1' - '2' + channel: 8.0.19/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -58,9 +64,10 @@ applications: - '3' - '4' - '5' + channel: pacific/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 6 storage: osd-devices: 10G @@ -73,9 +80,10 @@ applications: - '16' - '17' - '18' + channel: pacific/edge ceph-proxy: - charm: ceph-proxy + charm: ../../ceph-proxy.charm num_units: 1 options: source: *openstack-origin @@ -83,7 +91,7 @@ applications: - '9' ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw + charm: ch:ceph-radosgw num_units: 1 options: source: *openstack-origin @@ -92,9 +100,10 @@ applications: ec-profile-m: 2 to: - '10' + channel: pacific/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -105,9 +114,10 @@ applications: constraints: mem=2048 to: - '11' + channel: wallaby/edge cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: restrict-ceph-pools: True pool-type: erasure-coded @@ -115,9 +125,10 @@ applications: ec-profile-m: 2 ec-profile-plugin: lrc ec-profile-locality: 3 + channel: wallaby/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -125,18 +136,20 @@ applications: constraints: mem=1024 to: - '12' + channel: wallaby/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 constraints: mem=1024 options: source: *openstack-origin to: - '13' + channel: 3.8/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin @@ -146,9 +159,10 @@ applications: ec-profile-plugin: jerasure to: - '14' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin @@ -159,6 +173,7 @@ applications: libvirt-image-backend: rbd to: - '15' + channel: wallaby/edge relations: diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 7f91ed5..d989638 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin distro @@ -29,14 +31,17 @@ machines: applications: cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -44,9 +49,10 @@ applications: - '0' - '1' - '2' + channel: 8.0.19/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -55,9 +61,10 @@ applications: - '3' - '4' - '5' + channel: pacific/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 10G @@ -67,9 +74,10 @@ applications: - '6' - '7' - '8' + channel: pacific/edge ceph-proxy: - charm: ceph-proxy + charm: ../../ceph-proxy.charm num_units: 1 options: source: *openstack-origin @@ -77,15 +85,16 @@ applications: - '9' ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw + charm: ch:ceph-radosgw num_units: 1 options: source: *openstack-origin to: - '10' + channel: pacific/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -96,14 +105,16 @@ applications: constraints: mem=2048 to: - '11' + channel: wallaby/edge cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: restrict-ceph-pools: True + channel: wallaby/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -111,31 +122,35 @@ applications: constraints: mem=1024 to: - '12' + channel: wallaby/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 constraints: mem=1024 options: source: *openstack-origin to: - '13' + channel: 3.8/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: wallaby/edge relations: diff --git a/tests/bundles/focal-victoria-ec.yaml b/tests/bundles/focal-victoria-ec.yaml deleted file mode 100644 index f89dc1b..0000000 --- a/tests/bundles/focal-victoria-ec.yaml +++ /dev/null @@ -1,215 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 6 - storage: - osd-devices: 10G - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - '16' - - '17' - - '18' - - ceph-proxy: - charm: ceph-proxy - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw - num_units: 1 - options: - source: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - to: - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - to: - - '11' - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - restrict-ceph-pools: True - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: lrc - ec-profile-locality: 3 - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - constraints: mem=1024 - to: - - '12' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - constraints: mem=1024 - options: - source: *openstack-origin - to: - - '13' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: jerasure - to: - - '14' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: isa - libvirt-image-backend: rbd - to: - - '15' - - -relations: - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - - 'glance:image-service' - - 'nova-compute:image-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:ceph' - - 'ceph-proxy:client' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:ceph' - - 'ceph-proxy:client' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index d9eed00..0000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,186 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 10G - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-proxy: - charm: ceph-proxy - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw - num_units: 1 - options: - source: *openstack-origin - to: - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - to: - - '11' - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - restrict-ceph-pools: True - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - constraints: mem=1024 - to: - - '12' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - constraints: mem=1024 - options: - source: *openstack-origin - to: - - '13' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - -relations: - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/focal-wallaby-ec.yaml b/tests/bundles/focal-wallaby-ec.yaml index 852e1e0..29ae7dc 100644 --- a/tests/bundles/focal-wallaby-ec.yaml +++ b/tests/bundles/focal-wallaby-ec.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-wallaby @@ -32,14 +34,17 @@ machines: applications: cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -47,9 +52,10 @@ applications: - '0' - '1' - '2' + channel: 8.0.19/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -58,9 +64,10 @@ applications: - '3' - '4' - '5' + channel: pacific/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 6 storage: osd-devices: 10G @@ -73,9 +80,10 @@ applications: - '16' - '17' - '18' + channel: pacific/edge ceph-proxy: - charm: ceph-proxy + charm: ../../ceph-proxy.charm num_units: 1 options: source: *openstack-origin @@ -83,7 +91,7 @@ applications: - '9' ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw + charm: ch:ceph-radosgw num_units: 1 options: source: *openstack-origin @@ -92,9 +100,10 @@ applications: ec-profile-m: 2 to: - '10' + channel: pacific/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -105,9 +114,10 @@ applications: constraints: mem=2048 to: - '11' + channel: wallaby/edge cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: restrict-ceph-pools: True pool-type: erasure-coded @@ -115,9 +125,10 @@ applications: ec-profile-m: 2 ec-profile-plugin: lrc ec-profile-locality: 3 + channel: wallaby/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -125,18 +136,20 @@ applications: constraints: mem=1024 to: - '12' + channel: wallaby/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 constraints: mem=1024 options: source: *openstack-origin to: - '13' + channel: 3.8/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin @@ -146,9 +159,10 @@ applications: ec-profile-plugin: jerasure to: - '14' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin @@ -159,6 +173,7 @@ applications: libvirt-image-backend: rbd to: - '15' + channel: wallaby/edge relations: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index 2b609be..d13f786 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-wallaby @@ -29,14 +31,17 @@ machines: applications: cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0.19/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -44,9 +49,10 @@ applications: - '0' - '1' - '2' + channel: 8.0.19/edge ceph-mon: - charm: cs:~openstack-charmers/ceph-mon + charm: ch:ceph-mon num_units: 3 options: expected-osd-count: 3 @@ -55,9 +61,10 @@ applications: - '3' - '4' - '5' + channel: pacific/edge ceph-osd: - charm: cs:~openstack-charmers/ceph-osd + charm: ch:ceph-osd num_units: 3 storage: osd-devices: 10G @@ -67,9 +74,10 @@ applications: - '6' - '7' - '8' + channel: pacific/edge ceph-proxy: - charm: ceph-proxy + charm: ../../ceph-proxy.charm num_units: 1 options: source: *openstack-origin @@ -77,15 +85,16 @@ applications: - '9' ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw + charm: ch:ceph-radosgw num_units: 1 options: source: *openstack-origin to: - '10' + channel: pacific/edge cinder: - charm: cs:~openstack-charmers/cinder + charm: ch:cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -96,14 +105,16 @@ applications: constraints: mem=2048 to: - '11' + channel: wallaby/edge cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph + charm: ch:cinder-ceph options: restrict-ceph-pools: True + channel: wallaby/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -111,31 +122,35 @@ applications: constraints: mem=1024 to: - '12' + channel: wallaby/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 constraints: mem=1024 options: source: *openstack-origin to: - '13' + channel: 3.8/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '14' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 1 options: openstack-origin: *openstack-origin to: - '15' + channel: wallaby/edge relations: diff --git a/tests/bundles/groovy-victoria-ec.yaml b/tests/bundles/groovy-victoria-ec.yaml deleted file mode 100644 index 7c1c920..0000000 --- a/tests/bundles/groovy-victoria-ec.yaml +++ /dev/null @@ -1,215 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: groovy - -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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 6 - storage: - osd-devices: 10G - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - '16' - - '17' - - '18' - - ceph-proxy: - charm: ceph-proxy - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw - num_units: 1 - options: - source: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - to: - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - to: - - '11' - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - restrict-ceph-pools: True - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: lrc - ec-profile-locality: 3 - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - constraints: mem=1024 - to: - - '12' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - constraints: mem=1024 - options: - source: *openstack-origin - to: - - '13' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: jerasure - to: - - '14' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: isa - libvirt-image-backend: rbd - to: - - '15' - - -relations: - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - - 'glance:image-service' - - 'nova-compute:image-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:ceph' - - 'ceph-proxy:client' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:ceph' - - 'ceph-proxy:client' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index ce765f0..0000000 --- a/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,186 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: groovy - -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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 10G - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-proxy: - charm: ceph-proxy - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw - num_units: 1 - options: - source: *openstack-origin - to: - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - to: - - '11' - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - restrict-ceph-pools: True - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - constraints: mem=1024 - to: - - '12' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - constraints: mem=1024 - options: - source: *openstack-origin - to: - - '13' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - -relations: - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/hirsute-wallaby-ec.yaml b/tests/bundles/hirsute-wallaby-ec.yaml deleted file mode 100644 index 483a0fd..0000000 --- a/tests/bundles/hirsute-wallaby-ec.yaml +++ /dev/null @@ -1,215 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - '16': - '17': - '18': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 6 - storage: - osd-devices: 10G - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - '16' - - '17' - - '18' - - ceph-proxy: - charm: ceph-proxy - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw - num_units: 1 - options: - source: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - to: - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - to: - - '11' - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - restrict-ceph-pools: True - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: lrc - ec-profile-locality: 3 - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - constraints: mem=1024 - to: - - '12' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - constraints: mem=1024 - options: - source: *openstack-origin - to: - - '13' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: jerasure - to: - - '14' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - pool-type: erasure-coded - ec-profile-k: 4 - ec-profile-m: 2 - ec-profile-plugin: isa - libvirt-image-backend: rbd - to: - - '15' - - -relations: - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - - 'glance:image-service' - - 'nova-compute:image-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:ceph' - - 'ceph-proxy:client' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:ceph' - - 'ceph-proxy:client' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index d3b4d09..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,186 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -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': - '4': - '5': - '6': - '7': - '8': - '9': - '10': - '11': - '12': - '13': - '14': - '15': - -applications: - - cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - ceph-mon: - charm: cs:~openstack-charmers/ceph-mon - num_units: 3 - options: - expected-osd-count: 3 - source: *openstack-origin - to: - - '3' - - '4' - - '5' - - ceph-osd: - charm: cs:~openstack-charmers/ceph-osd - num_units: 3 - storage: - osd-devices: 10G - options: - source: *openstack-origin - to: - - '6' - - '7' - - '8' - - ceph-proxy: - charm: ceph-proxy - num_units: 1 - options: - source: *openstack-origin - to: - - '9' - - ceph-radosgw: - charm: cs:~openstack-charmers/ceph-radosgw - num_units: 1 - options: - source: *openstack-origin - to: - - '10' - - cinder: - charm: cs:~openstack-charmers/cinder - num_units: 1 - options: - openstack-origin: *openstack-origin - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - to: - - '11' - - cinder-ceph: - charm: cs:~openstack-charmers/cinder-ceph - options: - restrict-ceph-pools: True - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - admin-password: openstack - constraints: mem=1024 - to: - - '12' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - constraints: mem=1024 - options: - source: *openstack-origin - to: - - '13' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '14' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '15' - - -relations: - - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - - 'glance:image-service' - - 'nova-compute:image-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' - - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml deleted file mode 100644 index e3d1dd1..0000000 --- a/tests/bundles/trusty-mitaka.yaml +++ /dev/null @@ -1,115 +0,0 @@ -series: trusty -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:trusty-mitaka - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:trusty-mitaka - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:trusty-mitaka - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: trusty-mitaka - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:trusty-mitaka - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:trusty-mitaka - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:trusty-mitaka - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:trusty-mitaka - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:trusty-mitaka - constraints: mem=1024 - percona-cluster: - charm: 'cs:trusty/percona-cluster' - num_units: 1 - options: - source: cloud:trusty-mitaka - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:trusty-mitaka -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'glance:image-service' - - 'nova-cloud-controller:image-service' - - - 'keystone:identity-service' - - 'nova-cloud-controller:identity-service' - - - 'nova-compute:cloud-compute' - - 'nova-cloud-controller:cloud-compute' - - - 'percona-cluster:shared-db' - - 'nova-cloud-controller:shared-db' - - - 'rabbitmq-server:amqp' - - 'nova-cloud-controller:amqp' - diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index c79e382..0000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,85 +0,0 @@ -series: xenial -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - constraints: mem=1024 - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml deleted file mode 100644 index da62c9c..0000000 --- a/tests/bundles/xenial-ocata.yaml +++ /dev/null @@ -1,99 +0,0 @@ -series: xenial -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:xenial-ocata - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:xenial-ocata - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:xenial-ocata - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: xenial-ocata - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:xenial-ocata - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:xenial-ocata -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml deleted file mode 100644 index 3bddbd9..0000000 --- a/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,99 +0,0 @@ -series: bionic -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:xenial-pike - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:xenial-pike - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:xenial-pike - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: xenial-pike - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:xenial-pike - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:xenial-pike -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index 2d67c9c..0000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,99 +0,0 @@ -series: xenial -applications: - ceph-mon: - charm: 'cs:~openstack-charmers/ceph-mon' - num_units: 3 - options: - expected-osd-count: 3 - source: cloud:xenial-queens - ceph-osd: - charm: 'cs:~openstack-charmers/ceph-osd' - num_units: 3 - storage: - osd-devices: 10G - options: - source: cloud:xenial-queens - ceph-proxy: - charm: 'ceph-proxy' - num_units: 1 - options: - source: cloud:xenial-queens - ceph-radosgw: - charm: 'cs:~openstack-charmers/ceph-radosgw' - num_units: 1 - options: - source: cloud:xenial-queens - cinder: - charm: 'cs:~openstack-charmers/cinder' - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - block-device: "" - ephemeral-unmount: "" - glance-api-version: 2 - overwrite: "false" - constraints: mem=2048 - cinder-ceph: - charm: 'cs:~openstack-charmers/cinder-ceph' - options: - restrict-ceph-pools: True - keystone: - charm: 'cs:~openstack-charmers/keystone' - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - constraints: mem=1024 - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - percona-cluster: - charm: 'cs:~openstack-charmers/percona-cluster' - num_units: 1 - options: - source: cloud:xenial-queens - dataset-size: 50% - max-connections: 1000 - innodb-buffer-pool-size: 256M - root-password: ChangeMe123 - sst-password: ChangeMe123 - constraints: mem=4096 - rabbitmq-server: - charm: 'cs:~openstack-charmers/rabbitmq-server' - num_units: 1 - constraints: mem=1024 - options: - source: cloud:xenial-queens -relations: - - - 'ceph-osd:mon' - - 'ceph-mon:osd' - - - 'ceph-proxy:radosgw' - - 'ceph-radosgw:mon' - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - 'cinder:shared-db' - - 'percona-cluster:shared-db' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - 'cinder-ceph:storage-backend' - - 'cinder:storage-backend' - - - 'cinder-ceph:ceph' - - 'ceph-proxy:client' - - - 'glance:image-service' - - 'nova-compute:image-service' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:ceph-access' - - 'cinder-ceph:ceph-access' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' diff --git a/tests/tests.yaml b/tests/tests.yaml index 5187892..f8b9409 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -12,32 +12,12 @@ tests: - zaza.openstack.charm_tests.ceph.tests.CheckPoolTypes gate_bundles: - - xenial-mitaka # jewel - - bionic-queens # luminous - - bionic-stein - - bionic-train - - bionic-ussuri - focal-ussuri - erasure-coded: focal-ussuri-ec - - focal-victoria - - erasure-coded: focal-victoria-ec - focal-wallaby - erasure-coded: focal-wallaby-ec - - groovy-victoria - - erasure-coded: groovy-victoria-ec -dev_bundles: - # Icehouse - - trusty-icehouse - # Jewel - - trusty-mitaka - - xenial-ocata - # Pike - - xenial-pike - - xenial-queens # luminous - - bionic-rocky # mimic - - hirsute-wallaby - - erasure-coded: hirsute-wallaby-ec +dev_bundles: [] smoke_bundles: - focal-ussuri @@ -49,9 +29,9 @@ target_deploy_status: ceph-radosgw: workload-status: waiting workload-status-message: "Incomplete relations: mon" - cinder-ceph: - workload-status: waiting - workload-status-message: "Incomplete relations: ceph" + #cinder-ceph: + #workload-status: waiting + #workload-status-message: "Incomplete relations: ceph" keystone: workload-status: active workload-status-message: "Unit is ready" @@ -66,6 +46,4 @@ target_deploy_status: workload-status-message: "Incomplete relations: storage-backend" tests_options: - force_deploy: - - hirsute-wallaby - - hirsute-wallaby-ec + force_deploy: [] diff --git a/tox.ini b/tox.ini index ba4fd5b..81fd249 100644 --- a/tox.ini +++ b/tox.ini @@ -37,10 +37,20 @@ setenv = VIRTUAL_ENV={envdir} install_command = {toxinidir}/pip.sh install {opts} {packages} commands = stestr run --slowest {posargs} -allowlist_externals = juju +allowlist_externals = + charmcraft + rename.sh passenv = HOME TERM CS_* OS_* TEST_* deps = -r{toxinidir}/test-requirements.txt +[testenv:build] +basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + [testenv:py35] basepython = python3.5 deps = -r{toxinidir}/requirements.txt @@ -61,6 +71,11 @@ basepython = python3.8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +[testenv:py39] +basepython = python3.9 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:py3] basepython = python3 deps = -r{toxinidir}/requirements.txt