From b1f6734307ccd26c784644f04036428fbe800c90 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 2 Nov 2020 11:40:56 +0100 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Switch tests to stable. Switch to using stable charm-helpers branch. Switch to using stable charm.openstack branch. Change-Id: I844bafac4817b044b742fbb73c235084adeff404 --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- tests/bundles/bionic-rocky.yaml | 18 +++++++++--------- tests/bundles/bionic-stein.yaml | 18 +++++++++--------- tests/bundles/bionic-train.yaml | 20 ++++++++++---------- tests/bundles/bionic-ussuri.yaml | 20 ++++++++++---------- tests/bundles/eoan-train.yaml | 20 ++++++++++---------- tests/bundles/focal-ussuri.yaml | 30 +++++++++++++++--------------- tests/bundles/focal-victoria.yaml | 30 +++++++++++++++--------------- tests/bundles/groovy-victoria.yaml | 30 +++++++++++++++--------------- tests/bundles/trusty-mitaka.yaml | 16 ++++++++-------- tests/bundles/xenial-mitaka.yaml | 18 +++++++++--------- tests/bundles/xenial-ocata.yaml | 18 +++++++++--------- tests/bundles/xenial-pike.yaml | 18 +++++++++--------- tests/bundles/xenial-queens.yaml | 18 +++++++++--------- 15 files changed, 140 insertions(+), 138 deletions(-) diff --git a/.gitreview b/.gitreview index 8c3d120d..d12714c1 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-ceph-osd.git + +defaultbranch=stable/20.10 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index ca383631..5ca68358 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.10 destination: hooks/charmhelpers include: - core diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 684a8d5e..2e003191 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -10,54 +10,54 @@ applications: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:bionic-rocky ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-rocky cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-rocky diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 1332a5ad..b5182b2f 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -10,54 +10,54 @@ applications: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:bionic-stein ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-stein cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-stein diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index e5263975..ffe6bb65 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -10,58 +10,58 @@ applications: osd-devices: '/dev/test-non-existent' source: cloud:bionic-train 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 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-train cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-train placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-train diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index 6a858d4e..59f98db6 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -10,58 +10,58 @@ applications: osd-devices: '/dev/test-non-existent' source: cloud:bionic-ussuri 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 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:bionic-ussuri cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:bionic-ussuri placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:bionic-ussuri diff --git a/tests/bundles/eoan-train.yaml b/tests/bundles/eoan-train.yaml index d728b0b2..354210a6 100644 --- a/tests/bundles/eoan-train.yaml +++ b/tests/bundles/eoan-train.yaml @@ -10,58 +10,58 @@ applications: osd-devices: '/dev/test-non-existent' source: cloud:eoan-train ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' source: cloud:eoan-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:eoan-train rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:eoan-train keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:eoan-train nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: openstack-origin: cloud:eoan-train glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:eoan-train cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:eoan-train cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:eoan-train placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: cloud:eoan-train diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 51868c30..847baedd 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -29,18 +29,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 @@ -63,7 +63,7 @@ applications: - '5' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' @@ -74,7 +74,7 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -83,7 +83,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -91,7 +91,7 @@ applications: - '10' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: openstack-origin: *openstack-origin @@ -100,7 +100,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -109,7 +109,7 @@ applications: cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -119,11 +119,11 @@ applications: - '13' cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin @@ -131,7 +131,7 @@ applications: - '14' placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index c7e56257..d189a74e 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -29,18 +29,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 @@ -63,7 +63,7 @@ applications: - '5' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' @@ -74,7 +74,7 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -83,7 +83,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -91,7 +91,7 @@ applications: - '10' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: openstack-origin: *openstack-origin @@ -100,7 +100,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -109,7 +109,7 @@ applications: cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -119,11 +119,11 @@ applications: - '13' cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin @@ -131,7 +131,7 @@ applications: - '14' placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 1d1b1ffb..f275c9cf 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -29,18 +29,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 @@ -63,7 +63,7 @@ applications: - '5' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' @@ -74,7 +74,7 @@ applications: - '8' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -83,7 +83,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -91,7 +91,7 @@ applications: - '10' nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: openstack-origin: *openstack-origin @@ -100,7 +100,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin @@ -109,7 +109,7 @@ applications: cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -119,11 +119,11 @@ applications: - '13' cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: *openstack-origin @@ -131,7 +131,7 @@ applications: - '14' placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 555895d3..77031d6f 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -14,7 +14,7 @@ applications: constraints: virt-type=kvm ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' @@ -36,7 +36,7 @@ applications: constraints: virt-type=kvm rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: cloud:trusty-mitaka @@ -46,7 +46,7 @@ applications: virt-type=kvm keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:trusty-mitaka @@ -55,7 +55,7 @@ applications: constraints: virt-type=kvm nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: openstack-origin: cloud:trusty-mitaka @@ -65,7 +65,7 @@ applications: virt-type=kvm glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:trusty-mitaka @@ -75,7 +75,7 @@ applications: virt-type=kvm cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' @@ -86,10 +86,10 @@ applications: constraints: virt-type=kvm cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:trusty-mitaka diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index 4500ce95..834e9e8f 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -9,43 +9,43 @@ applications: options: osd-devices: '/srv/ceph /dev/test-non-existent' ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 relations: - - nova-compute:amqp diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index ef2bfb54..e53d367b 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -10,54 +10,54 @@ applications: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:xenial-ocata ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: cloud:xenial-ocata 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:xenial-ocata cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:xenial-ocata diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index 2874cfe4..4c2f6e99 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -10,54 +10,54 @@ applications: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:xenial-pike ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: cloud:xenial-pike 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:xenial-pike cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:xenial-pike diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 8c5a762a..01b824fb 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -10,54 +10,54 @@ applications: osd-devices: '/srv/ceph /dev/test-non-existent' source: cloud:xenial-queens ceph-mon: - charm: cs:~openstack-charmers-next/ceph-mon + charm: cs:~openstack-charmers/ceph-mon num_units: 3 options: monitor-count: '3' auth-supported: 'none' source: cloud:xenial-queens 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 rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: 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 nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute 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 cinder: expose: True - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: block-device: 'None' glance-api-version: '2' openstack-origin: cloud:xenial-queens cinder-ceph: - charm: cs:~openstack-charmers-next/cinder-ceph + charm: cs:~openstack-charmers/cinder-ceph nova-cloud-controller: expose: True - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: openstack-origin: cloud:xenial-queens