diff --git a/.gitreview b/.gitreview index a257521..efa14f2 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-swift-proxy.git + +defaultbranch=stable/21.10 diff --git a/actions/actions.py b/actions/actions.py index a49d345..40f4761 100755 --- a/actions/actions.py +++ b/actions/actions.py @@ -67,7 +67,7 @@ def get_action_parser(actions_yaml_path, action_name, get_services=services): """Make an argparse.ArgumentParser seeded from actions.yaml definitions.""" with open(actions_yaml_path) as fh: - doc = yaml.load(fh)[action_name]["description"] + doc = yaml.safe_load(fh)[action_name]["description"] parser = argparse.ArgumentParser(description=doc) parser.add_argument("--services", default=get_services()) # TODO: Add arguments for params defined in the actions.yaml diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index c259090..e0a82e4 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers +repo: https://github.com/juju/charm-helpers@stable/21.10 destination: charmhelpers include: - core diff --git a/test-requirements.txt b/test-requirements.txt index dba2c76..0a7e94a 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. # +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 requests>=2.18.4 @@ -36,8 +37,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#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 # 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 index 1f1caee..b4205b8 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -9,26 +9,30 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index b1ad006..4022503 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -10,32 +10,36 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-rocky 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:bionic-rocky zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index d92bb7c..c6a1825 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -10,32 +10,36 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-stein 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-stein + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:bionic-stein zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-train-gr-r1.yaml b/tests/bundles/bionic-train-gr-r1.yaml index edf8dd6..8322baf 100644 --- a/tests/bundles/bionic-train-gr-r1.yaml +++ b/tests/bundles/bionic-train-gr-r1.yaml @@ -15,48 +15,54 @@ applications: write-affinity-node-count: '1' openstack-origin: cloud:bionic-train swift-storage-region1-zone1: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 1 zone: 1 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train + channel: candidate swift-storage-region1-zone2: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 1 zone: 2 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train + channel: candidate swift-storage-region1-zone3: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 1 zone: 3 block-device: /etc/swift/storage.img|2G openstack-origin: 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 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 relations: - - swift-proxy-region1:swift-storage - swift-storage-region1-zone1:swift-storage diff --git a/tests/bundles/bionic-train-gr-r2.yaml b/tests/bundles/bionic-train-gr-r2.yaml index 4d513f8..c4f0a38 100644 --- a/tests/bundles/bionic-train-gr-r2.yaml +++ b/tests/bundles/bionic-train-gr-r2.yaml @@ -15,29 +15,32 @@ applications: write-affinity-node-count: '1' openstack-origin: cloud:bionic-train swift-storage-region2-zone1: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 2 zone: 1 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train + channel: candidate swift-storage-region2-zone2: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 2 zone: 2 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train + channel: candidate swift-storage-region2-zone3: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 2 zone: 3 block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train + channel: candidate relations: - - swift-proxy-region2:swift-storage - swift-storage-region2-zone1:swift-storage diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 2dcb89e..2e2786a 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -10,32 +10,36 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-train 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:bionic-train zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index 24f40ea..1f0f97c 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -10,32 +10,36 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-ussuri 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:bionic-ussuri zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 8c5612b..a11621f 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -20,12 +20,14 @@ 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 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 @@ -33,15 +35,17 @@ applications: - '0' - '1' - '2' + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: candidate swift-proxy: charm: swift-proxy @@ -56,15 +60,16 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -73,6 +78,7 @@ applications: openstack-origin: *openstack-origin to: - '6' + channel: candidate relations: diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 2fff45f..252c86d 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -20,12 +20,14 @@ 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 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 @@ -33,15 +35,17 @@ applications: - '0' - '1' - '2' + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: candidate swift-proxy: charm: swift-proxy @@ -56,15 +60,16 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -73,6 +78,7 @@ applications: openstack-origin: *openstack-origin to: - '6' + channel: candidate relations: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index 1e72922..c366ea1 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -20,12 +20,14 @@ 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 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 @@ -33,15 +35,17 @@ applications: - '0' - '1' - '2' + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: candidate swift-proxy: charm: swift-proxy @@ -56,15 +60,16 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -73,6 +78,7 @@ applications: openstack-origin: *openstack-origin to: - '6' + channel: candidate relations: diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 5668295..684e307 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -20,12 +20,14 @@ 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 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 @@ -33,15 +35,17 @@ applications: - '0' - '1' - '2' + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: candidate swift-proxy: charm: swift-proxy @@ -56,15 +60,16 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -73,6 +78,7 @@ applications: openstack-origin: *openstack-origin to: - '6' + channel: candidate relations: diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml index 83b777d..ae65f73 100644 --- a/tests/bundles/hirsute-wallaby.yaml +++ b/tests/bundles/hirsute-wallaby.yaml @@ -20,12 +20,14 @@ 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 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 @@ -33,15 +35,17 @@ applications: - '0' - '1' - '2' + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: candidate swift-proxy: charm: swift-proxy @@ -56,15 +60,16 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -73,6 +78,7 @@ applications: openstack-origin: *openstack-origin to: - '6' + channel: candidate relations: diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index d559eac..23ff175 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -20,12 +20,14 @@ 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 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 @@ -33,15 +35,17 @@ applications: - '0' - '1' - '2' + channel: candidate keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: candidate swift-proxy: charm: swift-proxy @@ -56,15 +60,16 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' @@ -73,6 +78,7 @@ applications: openstack-origin: *openstack-origin to: - '6' + channel: candidate relations: diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 8206b38..b02c8c0 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -18,24 +18,27 @@ applications: source: cloud:trusty-mitaka keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:trusty-mitaka + channel: candidate glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:trusty-mitaka + channel: candidate swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:trusty-mitaka zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index fcc046f..122e9c2 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -9,26 +9,30 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index ce3bfc0..b704683 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -10,32 +10,36 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:xenial-ocata zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index e6a7345..03ee687 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -10,32 +10,36 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:xenial-pike zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 5596a4a..a86972b 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -10,32 +10,36 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae 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 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 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' options: openstack-origin: cloud:xenial-queens zone: 1 + channel: candidate relations: - - keystone:shared-db - percona-cluster:shared-db