diff --git a/.gitreview b/.gitreview index 245b1ad..a0063ff 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-ceph-fs.git + +defaultbranch=stable/21.10 diff --git a/pip.sh b/pip.sh new file mode 100755 index 0000000..9a7e6b0 --- /dev/null +++ b/pip.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# +# This file is managed centrally by release-tools and should not be modified +# within individual charm repos. See the 'global' dir contents for available +# choices of tox.ini for OpenStack Charms: +# https://github.com/openstack-charmers/release-tools +# +# setuptools 58.0 dropped the support for use_2to3=true which is needed to +# install blessings (an indirect dependency of charm-tools). +# +# More details on the beahvior of tox and virtualenv creation can be found at +# https://github.com/tox-dev/tox/issues/448 +# +# This script is wrapper to force the use of the pinned versions early in the +# process when the virtualenv was created and upgraded before installing the +# depedencies declared in the target. +pip install 'pip<20.3' 'setuptools<50.0.0' +pip "$@" diff --git a/src/build.lock b/src/build.lock new file mode 100644 index 0000000..cfc0ecb --- /dev/null +++ b/src/build.lock @@ -0,0 +1,198 @@ +{ + "locks": [ + { + "type": "layer", + "item": "layer:options", + "url": "https://github.com/juju-solutions/layer-options.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "fcdcea4e5de3e1556c24e6704607862d0ba00a56" + }, + { + "type": "layer", + "item": "layer:basic", + "url": "https://github.com/juju-solutions/layer-basic.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "a3ff62c32c993d80417f6e093e3ef95e42f62083" + }, + { + "type": "layer", + "item": "layer:openstack", + "url": "https://github.com/openstack/charm-layer-openstack", + "vcs": null, + "branch": "refs/heads/master", + "commit": "207bac8bec837edc6a4d6003f51d5b59d2d75adb" + }, + { + "type": "layer", + "item": "layer:ceph", + "url": "https://github.com/openstack/charm-layer-ceph.git", + "vcs": null, + "branch": "refs/heads/master", + "commit": "17d40abd8d9ec3b8c32756ca981c80c4733c016f" + }, + { + "type": "layer", + "item": "ceph-fs", + "url": null, + "vcs": null, + "branch": "refs/heads/21.10-updates\nrefs/heads/master", + "commit": "refs/heads/21.10-updates\nrefs/heads/master" + }, + { + "type": "layer", + "item": "interface:tls-certificates", + "url": "https://github.com/juju-solutions/interface-tls-certificates", + "vcs": null, + "branch": "refs/heads/master", + "commit": "d9850016d930a6d507b9fd45e2598d327922b140" + }, + { + "type": "layer", + "item": "interface:ceph-mds", + "url": "https://opendev.org/openstack/charm-interface-ceph-client.git", + "vcs": null, + "branch": null, + "commit": "3ca251fb01a7cd51d2a0ee2b9b66647c8ffe891f" + }, + { + "type": "python_module", + "package": "Jinja2", + "vcs": null, + "version": "2.10.1" + }, + { + "type": "python_module", + "package": "psutil", + "vcs": null, + "version": "5.8.0" + }, + { + "type": "python_module", + "package": "dnspython", + "vcs": null, + "version": "1.15.0" + }, + { + "type": "python_module", + "package": "setuptools", + "vcs": null, + "version": "41.6.0" + }, + { + "type": "python_module", + "package": "pip", + "vcs": null, + "version": "18.1" + }, + { + "type": "python_module", + "package": "pbr", + "vcs": null, + "version": "5.6.0" + }, + { + "type": "python_module", + "package": "PyYAML", + "vcs": null, + "version": "5.2" + }, + { + "type": "python_module", + "package": "dnspython3", + "vcs": null, + "version": "1.15.0" + }, + { + "type": "python_module", + "package": "setuptools_scm", + "vcs": null, + "version": "1.17.0" + }, + { + "type": "python_module", + "package": "netifaces", + "vcs": null, + "version": "0.11.0" + }, + { + "type": "python_module", + "package": "MarkupSafe", + "vcs": null, + "version": "1.1.1" + }, + { + "type": "python_module", + "package": "Tempita", + "vcs": null, + "version": "0.4" + }, + { + "type": "python_module", + "package": "charms.openstack", + "url": "git+https://github.com/openstack/charms.openstack.git", + "branch": "refs/heads/stable/21.10", + "version": "10627ee5f991c268f174d6d100e218a0e1867af1", + "vcs": "git" + }, + { + "type": "python_module", + "package": "charms.reactive", + "vcs": null, + "version": "1.4.1" + }, + { + "type": "python_module", + "package": "ceph_api", + "vcs": null, + "version": "0.4.0" + }, + { + "type": "python_module", + "package": "six", + "vcs": null, + "version": "1.16.0" + }, + { + "type": "python_module", + "package": "charmhelpers", + "url": "git+https://github.com/juju/charm-helpers.git", + "branch": "refs/heads/stable/21.10", + "version": "26efcd0da51d580f68ead2ca13c38f58766f8a14", + "vcs": "git" + }, + { + "type": "python_module", + "package": "netaddr", + "vcs": null, + "version": "0.7.19" + }, + { + "type": "python_module", + "package": "charms.ceph", + "url": "git+https://github.com/openstack/charms.ceph.git", + "branch": "refs/heads/master", + "version": "16bcf7571279c64da98fa9176ae030390ba78639", + "vcs": "git" + }, + { + "type": "python_module", + "package": "wheel", + "vcs": null, + "version": "0.33.6" + }, + { + "type": "python_module", + "package": "pyaml", + "vcs": null, + "version": "21.10.1" + }, + { + "type": "python_module", + "package": "pyxattr", + "vcs": null, + "version": "0.7.2" + } + ] +} \ No newline at end of file diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e771023..bd0c1a8 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/21.10#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index fc6301f..7ec0c8f 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -5,36 +5,42 @@ applications: series: bionic num_units: 1 ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/srv/ceph /dev/test-non-existent' + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -42,25 +48,30 @@ applications: enable-live-migration: true enable-resize: true migration-auth-type: ssh + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 222a1ae..52aa6fb 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -10,45 +10,51 @@ applications: ec-profile-k: 4 ec-profile-m: 2 ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:bionic-rocky + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:bionic-rocky + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 source: cloud:bionic-rocky + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:bionic-rocky + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -57,28 +63,33 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: cloud:bionic-rocky + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:bionic-rocky + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:bionic-rocky + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-rocky + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 2e59c83..fa833df 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -12,48 +12,55 @@ applications: ec-profile-k: 4 ec-profile-m: 2 ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: source: *source + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: source: *source + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *source + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *source + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *source + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *source + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *source + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 constraints: mem=8G root-disk=60G options: @@ -62,21 +69,25 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *source + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *source + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: *source + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 3dfe9e6..cef7aa4 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -10,52 +10,59 @@ applications: ec-profile-k: 4 ec-profile-m: 2 ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: cloud:bionic-train + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:bionic-train + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 source: cloud:bionic-train + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:bionic-train + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:bionic-train + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -64,26 +71,31 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: cloud:bionic-train + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-train + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:bionic-train + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-train + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index b479d66..57a75f7 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -9,52 +9,59 @@ applications: ec-profile-k: 4 ec-profile-m: 2 ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: cloud:bionic-ussuri + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:bionic-ussuri + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 source: cloud:bionic-ussuri + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:bionic-ussuri + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:bionic-ussuri + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -63,13 +70,15 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: cloud:bionic-ussuri + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-ussuri + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -77,14 +86,17 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:bionic-ussuri + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:bionic-ussuri + channel: candidate relations: - - 'ceph-mon:mds' - 'ceph-fs:ceph-mds' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 39d9fed..e613d4a 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -16,18 +16,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -35,6 +40,7 @@ applications: - '0' - '1' - '2' + channel: candidate ceph-fs: charm: ceph-fs @@ -48,51 +54,57 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: *openstack-origin + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -101,15 +113,17 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -117,16 +131,19 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: *openstack-origin + channel: candidate relations: diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index b23a8d5..d8f621e 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -16,18 +16,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -35,6 +40,7 @@ applications: - '0' - '1' - '2' + channel: candidate ceph-fs: charm: ceph-fs @@ -48,51 +54,57 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: *openstack-origin + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -101,15 +113,17 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -117,16 +131,19 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: *openstack-origin + channel: candidate relations: diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml index 4134e10..48ff7a5 100644 --- a/src/tests/bundles/focal-wallaby.yaml +++ b/src/tests/bundles/focal-wallaby.yaml @@ -16,18 +16,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -35,6 +40,7 @@ applications: - '0' - '1' - '2' + channel: candidate ceph-fs: charm: ceph-fs @@ -48,51 +54,57 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: *openstack-origin + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -101,15 +113,17 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -117,16 +131,19 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: *openstack-origin + channel: candidate relations: diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index bdc91e1..d3b9b60 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -16,18 +16,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -35,6 +40,7 @@ applications: - '0' - '1' - '2' + channel: candidate ceph-fs: charm: ceph-fs @@ -48,51 +54,57 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: *openstack-origin + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -101,15 +113,17 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -117,16 +131,19 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: *openstack-origin + channel: candidate relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml index 400be96..862a559 100644 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -16,18 +16,23 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate neutron-api-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router + channel: candidate mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -35,6 +40,7 @@ applications: - '0' - '1' - '2' + channel: candidate ceph-fs: charm: ceph-fs @@ -48,51 +54,57 @@ applications: - '3' ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 6 storage: osd-devices: 'cinder,10G' options: osd-devices: '/dev/test-non-existent' source: *openstack-origin + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: *openstack-origin + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -101,15 +113,17 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: candidate placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -117,16 +131,19 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: *openstack-origin + channel: candidate relations: diff --git a/src/tests/bundles/xenial-mitaka.yaml b/src/tests/bundles/xenial-mitaka.yaml index 71486c1..56a3f1c 100644 --- a/src/tests/bundles/xenial-mitaka.yaml +++ b/src/tests/bundles/xenial-mitaka.yaml @@ -5,42 +5,49 @@ applications: series: xenial num_units: 1 ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/srv/ceph /dev/test-non-existent' + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -48,19 +55,23 @@ applications: enable-live-migration: true enable-resize: true migration-auth-type: ssh + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tests/bundles/xenial-ocata.yaml b/src/tests/bundles/xenial-ocata.yaml index ee645f3..df36b78 100644 --- a/src/tests/bundles/xenial-ocata.yaml +++ b/src/tests/bundles/xenial-ocata.yaml @@ -7,52 +7,59 @@ applications: options: source: cloud:xenial-ocata ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:xenial-ocata + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:xenial-ocata + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 source: cloud:xenial-ocata + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:xenial-ocata + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-ocata + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-ocata + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:xenial-ocata + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -61,21 +68,25 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: cloud:xenial-ocata + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:xenial-ocata + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:xenial-ocata + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tests/bundles/xenial-pike.yaml b/src/tests/bundles/xenial-pike.yaml index da172d3..3584601 100644 --- a/src/tests/bundles/xenial-pike.yaml +++ b/src/tests/bundles/xenial-pike.yaml @@ -7,52 +7,59 @@ applications: options: source: cloud:xenial-pike ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:xenial-pike + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:xenial-pike + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 source: cloud:xenial-pike + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:xenial-pike + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-pike + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-pike + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:xenial-pike + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G root-disk=20G options: @@ -61,21 +68,25 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: cloud:xenial-pike + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:xenial-pike + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:xenial-pike + channel: candidate relations: - - ceph-osd:mon - ceph-mon:osd diff --git a/src/tests/bundles/xenial-queens.yaml b/src/tests/bundles/xenial-queens.yaml index dc0cc9b..7c0087c 100644 --- a/src/tests/bundles/xenial-queens.yaml +++ b/src/tests/bundles/xenial-queens.yaml @@ -7,52 +7,59 @@ applications: options: source: cloud:xenial-queens ceph-osd: - charm: cs:~openstack-charmers-next/ceph-osd + charm: cs:~openstack-charmers/ceph-osd num_units: 3 storage: osd-devices: 'cinder,10G' options: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:xenial-queens + channel: candidate ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:xenial-queens + channel: candidate percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 source: cloud:xenial-queens + channel: candidate rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:xenial-queens + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-queens + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-queens + channel: candidate nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: cloud:xenial-queens + channel: candidate nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 2 constraints: mem=8G options: @@ -61,21 +68,25 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: cloud:xenial-queens + channel: candidate neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api num_units: 1 options: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: cloud:xenial-queens + channel: candidate neutron-openvswitch: - charm: cs:~openstack-charmers-next/neutron-openvswitch + charm: cs:~openstack-charmers/neutron-openvswitch + channel: candidate neutron-gateway: - charm: cs:~openstack-charmers-next/neutron-gateway + charm: cs:~openstack-charmers/neutron-gateway num_units: 1 options: bridge-mappings: physnet1:br-ex openstack-origin: cloud:xenial-queens + channel: candidate relations: - - ceph-mon:mds - ceph-fs:ceph-mds diff --git a/src/tox.ini b/src/tox.ini index e763047..b40d295 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -22,12 +22,12 @@ skip_missing_interpreters = False requires = pip < 20.3 virtualenv < 20.0 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci -minversion = 3.2.0 +minversion = 3.18.0 [testenv] setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 -whitelist_externals = juju +allowlist_externals = juju passenv = HOME TERM CS_* OS_* TEST_* deps = -r{toxinidir}/test-requirements.txt install_command = diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 303c396..99ab808 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -4,8 +4,8 @@ ceph_api pyxattr psutil -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack git+https://github.com/openstack/charms.ceph.git#egg=charms.ceph -git+https://github.com/juju/charm-helpers.git#egg=charmhelpers +git+https://github.com/juju/charm-helpers.git@stable/21.10#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index af069e1..4afbb28 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,7 @@ # choices of *requirements.txt files for OpenStack Charms: # https://github.com/openstack-charmers/release-tools # +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 stestr>=2.2.0 @@ -33,7 +34,7 @@ mock>=1.2; python_version >= '3.6' nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/21.10#egg=charms.openstack # # Revisit for removal / mock improvement: # diff --git a/tox.ini b/tox.ini index 5c81801..22159df 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,21 @@ envlist = pep8,py3 sitepackages = False # NOTE: Avoid false positives by not skipping missing interpreters. skip_missing_interpreters = False +# NOTES: +# * We avoid the new dependency resolver by pinning pip < 20.3, see +# https://github.com/pypa/pip/issues/9187 +# * Pinning dependencies requires tox >= 3.2.0, see +# https://tox.readthedocs.io/en/latest/config.html#conf-requires +# * It is also necessary to pin virtualenv as a newer virtualenv would still +# lead to fetching the latest pip in the func* tox targets, see +# https://stackoverflow.com/a/38133283 +requires = + pip < 20.3 + virtualenv < 20.0 + setuptools<50.0.0 + +# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci +minversion = 3.18.0 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir} JUJU_REPOSITORY={toxinidir}/build passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY install_command = - pip install {opts} {packages} + {toxinidir}/pip.sh install {opts} {packages} deps = -r{toxinidir}/requirements.txt