From 4f6c5012a3f2220e828ecc9271e6148f20186c0c Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 29 May 2020 12:54:58 +0100 Subject: [PATCH] Add glance/nova-compute to bundles This is to resolve the associated bug where cinder-ceph has grown the capability to block if it doesn't have an appropriate relation to nova-compute. Change-Id: Idac890dc8ab33941979e3cf7f46b764dbf3df9a1 Closes-Bug: #1881246 --- tests/bundles/bionic-queens.yaml | 16 ++++++++++++++++ tests/bundles/bionic-rocky.yaml | 16 ++++++++++++++++ tests/bundles/bionic-stein.yaml | 16 ++++++++++++++++ tests/bundles/bionic-train.yaml | 16 ++++++++++++++++ tests/bundles/trusty-mitaka.yaml | 16 ++++++++++++++++ tests/bundles/xenial-mitaka.yaml | 16 ++++++++++++++++ tests/bundles/xenial-ocata.yaml | 16 ++++++++++++++++ tests/bundles/xenial-pike.yaml | 16 ++++++++++++++++ tests/bundles/xenial-queens.yaml | 16 ++++++++++++++++ 9 files changed, 144 insertions(+) diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 344fbef..48a889c 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -59,3 +69,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index ca40934..22bc35c 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -65,3 +75,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 1e1f306..991d4d4 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -65,3 +75,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 1548a62..3f7a53f 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -64,3 +74,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 7b2562f..5b41b19 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:trusty/percona-cluster @@ -65,3 +75,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index 975db0f..88b586c 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -59,3 +69,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index eb9bf1a..ea8abda 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -65,3 +75,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index 8a4362d..879d442 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -65,3 +75,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index dd133dc..9d24280 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -18,6 +18,16 @@ relations: - keystone:identity-service - - cinder:amqp - rabbitmq-server:amqp +- - glance:image-service + - nova-compute:image-service +- - glance:identity-service + - keystone:identity-service +- - glance:shared-db + - percona-cluster:shared-db +- - nova-compute:ceph-access + - cinder-ceph:ceph-access +- - nova-compute:amqp + - rabbitmq-server:amqp applications: percona-cluster: charm: cs:~openstack-charmers-next/percona-cluster @@ -65,3 +75,9 @@ applications: charm: cs:~openstack-charmers-next/cinder-ceph options: ceph-osd-replication-count: 3 + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1