From f9174a205b3fb03a6bf4325966051277a57ed7c4 Mon Sep 17 00:00:00 2001 From: Luciano Lo Giudice Date: Thu, 23 Sep 2021 11:52:05 -0300 Subject: [PATCH] Update test bundles --- src/tests/bundles/bionic-queens.yaml | 1 + src/tests/bundles/bionic-rocky.yaml | 1 + src/tests/bundles/bionic-stein.yaml | 1 + src/tests/bundles/bionic-train.yaml | 1 + src/tests/bundles/bionic-ussuri.yaml | 1 + src/tests/bundles/focal-ussuri.yaml | 11 ++++++----- src/tests/bundles/focal-victoria.yaml | 13 +++++++------ src/tests/bundles/groovy-victoria.yaml | 13 +++++++------ src/tests/bundles/hirsute-wallaby.yaml | 13 +++++++------ 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index b6f65e4..c10f10e 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + constraints: mem=4G root-disk=16G '3': relations: - - keystone:shared-db diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index 1157bfe..b8088af 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + constraints: mem=4G root-disk=16G '3': relations: - - keystone:shared-db diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml index 322e3c4..ad24f1c 100644 --- a/src/tests/bundles/bionic-stein.yaml +++ b/src/tests/bundles/bionic-stein.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + constraints: mem=4G root-disk=16G '3': relations: - - keystone:shared-db diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml index 6e63370..2de747b 100644 --- a/src/tests/bundles/bionic-train.yaml +++ b/src/tests/bundles/bionic-train.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + constraints: mem=4G root-disk=16G '3': relations: - - keystone:shared-db diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml index 8f7ef29..e4d29d5 100644 --- a/src/tests/bundles/bionic-ussuri.yaml +++ b/src/tests/bundles/bionic-ussuri.yaml @@ -6,6 +6,7 @@ machines: constraints: mem=3072M '1': '2': + constraints: mem=4G root-disk=16G '3': relations: - - keystone:shared-db diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml index 8cc6649..58a8fec 100644 --- a/src/tests/bundles/focal-ussuri.yaml +++ b/src/tests/bundles/focal-ussuri.yaml @@ -13,6 +13,7 @@ machines: '3': '4': '5': + constraints: mem=4G root-disk=16G relations: - - keystone:shared-db - keystone-mysql-router:shared-db @@ -30,7 +31,7 @@ relations: - cinder-netapp:storage-backend applications: mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: cs:~openstack-charmers-next/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -39,7 +40,7 @@ applications: - '1' - '2' rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: cs:~openstack-charmers-next/rabbitmq-server num_units: 1 options: source: *openstack-origin @@ -53,9 +54,9 @@ applications: to: - '4' keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router cinder: - charm: cs:~openstack-charmers/cinder + charm: cs:~openstack-charmers-next/cinder num_units: 1 storage: block-devices: '40G' @@ -72,4 +73,4 @@ applications: netapp-storage-protocol: iscsi volume-backend-name: NETAPP cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml index cf64baa..c92ca56 100644 --- a/src/tests/bundles/focal-victoria.yaml +++ b/src/tests/bundles/focal-victoria.yaml @@ -13,6 +13,7 @@ machines: '3': '4': '5': + constraints: mem=4G root-disk=16G relations: - - keystone:shared-db - keystone-mysql-router:shared-db @@ -30,7 +31,7 @@ relations: - cinder-netapp:storage-backend applications: mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: cs:~openstack-charmers-next/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -39,23 +40,23 @@ applications: - '1' - '2' rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: cs:~openstack-charmers-next/rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' keystone: - charm: cs:~openstack-charmers/keystone + charm: cs:~openstack-charmers-next/keystone options: openstack-origin: *openstack-origin num_units: 1 to: - '4' keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router cinder: - charm: cs:~openstack-charmers/cinder + charm: cs:~openstack-charmers-next/cinder storage: block-devices: '40G' num_units: 1 @@ -72,4 +73,4 @@ applications: netapp-storage-protocol: iscsi volume-backend-name: NETAPP cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml index 53a2be6..3780a82 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/groovy-victoria.yaml @@ -13,6 +13,7 @@ machines: '3': '4': '5': + constraints: mem=4G root-disk=16G relations: - - keystone:shared-db - keystone-mysql-router:shared-db @@ -30,7 +31,7 @@ relations: - cinder-netapp:storage-backend applications: mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: cs:~openstack-charmers-next/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -39,23 +40,23 @@ applications: - '1' - '2' rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: cs:~openstack-charmers-next/rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' keystone: - charm: cs:~openstack-charmers/keystone + charm: cs:~openstack-charmers-next/keystone options: openstack-origin: *openstack-origin num_units: 1 to: - '4' keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router cinder: - charm: cs:~openstack-charmers/cinder + charm: cs:~openstack-charmers-next/cinder storage: block-devices: '40G' num_units: 1 @@ -72,4 +73,4 @@ applications: netapp-storage-protocol: iscsi volume-backend-name: NETAPP cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml index b9bbe72..d304567 100644 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ b/src/tests/bundles/hirsute-wallaby.yaml @@ -13,6 +13,7 @@ machines: '3': '4': '5': + constraints: mem=4G root-disk=16G relations: - - keystone:shared-db - keystone-mysql-router:shared-db @@ -30,7 +31,7 @@ relations: - cinder-netapp:storage-backend applications: mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: cs:~openstack-charmers-next/mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -39,23 +40,23 @@ applications: - '1' - '2' rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: cs:~openstack-charmers-next/rabbitmq-server num_units: 1 options: source: *openstack-origin to: - '3' keystone: - charm: cs:~openstack-charmers/keystone + charm: cs:~openstack-charmers-next/keystone options: openstack-origin: *openstack-origin num_units: 1 to: - '4' keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router cinder: - charm: cs:~openstack-charmers/cinder + charm: cs:~openstack-charmers-next/cinder storage: block-devices: '40G' num_units: 1 @@ -72,4 +73,4 @@ applications: netapp-storage-protocol: iscsi volume-backend-name: NETAPP cinder-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: cs:~openstack-charmers-next/mysql-router