diff --git a/.gitreview b/.gitreview index a257521..d5e3690 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-swift-proxy.git + +defaultbranch=stable/20.08 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index c259090..e740a62 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/20.08 destination: charmhelpers include: - core diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 1f1caee..4149d0e 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -9,21 +9,21 @@ 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 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index b1ad006..f9e6613 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:bionic-rocky keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index d92bb7c..02dc4fe 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:bionic-stein keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/bionic-train-gr-r1.yaml b/tests/bundles/bionic-train-gr-r1.yaml index 718f440..3aaf35b 100644 --- a/tests/bundles/bionic-train-gr-r1.yaml +++ b/tests/bundles/bionic-train-gr-r1.yaml @@ -14,7 +14,7 @@ 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 @@ -22,7 +22,7 @@ applications: block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train swift-storage-region1-zone2: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 1 @@ -30,7 +30,7 @@ applications: block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train swift-storage-region1-zone3: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 1 @@ -38,7 +38,7 @@ applications: block-device: /etc/swift/storage.img|2G 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% @@ -46,13 +46,13 @@ applications: source: cloud:bionic-train keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train diff --git a/tests/bundles/bionic-train-gr-r2.yaml b/tests/bundles/bionic-train-gr-r2.yaml index 4cdd411..cd175bc 100644 --- a/tests/bundles/bionic-train-gr-r2.yaml +++ b/tests/bundles/bionic-train-gr-r2.yaml @@ -14,7 +14,7 @@ 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 @@ -22,7 +22,7 @@ applications: block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train swift-storage-region2-zone2: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 2 @@ -30,7 +30,7 @@ applications: block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train swift-storage-region2-zone3: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 options: storage-region: 2 diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 2dcb89e..05f0ca1 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:bionic-train keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index 24f40ea..90f08e1 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:bionic-ussuri keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 7c3a121..6b34d97 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -20,18 +20,18 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -42,7 +42,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -62,7 +62,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -70,7 +70,7 @@ applications: - '5' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 4adb9cb..9c641a8 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -20,18 +20,18 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -42,7 +42,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -62,7 +62,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -70,7 +70,7 @@ applications: - '5' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index a0b3085..f921d6a 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -20,18 +20,18 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: cs:~openstack-charmers/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -42,7 +42,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -62,7 +62,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -70,7 +70,7 @@ applications: - '5' swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 8206b38..5eed7e2 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -18,18 +18,18 @@ 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 glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:trusty-mitaka swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index fcc046f..58997be 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -9,21 +9,21 @@ 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 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index ce3bfc0..b74eec0 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:xenial-ocata keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-ocata glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-ocata swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index e6a7345..68b72b0 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:xenial-pike keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-pike glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-pike swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G' diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 5596a4a..1351e40 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -10,7 +10,7 @@ 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% @@ -18,18 +18,18 @@ applications: source: cloud:xenial-queens keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-queens glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-queens swift-storage: - charm: cs:~openstack-charmers-next/swift-storage + charm: cs:~openstack-charmers/swift-storage num_units: 1 storage: block-devices: 'cinder,10G'