Add the bundles and overlay for the functional tests

This charm requires an overlay to properly set the access
and credentials to connect to a NetApp instance. Additionally,
add the functional bundles following the blueprint set by
the cinder charm.
This commit is contained in:
Luciano Lo Giudice 2021-09-10 23:56:50 -03:00
parent 99c9478131
commit 3a3a3f9f2a
10 changed files with 447 additions and 94 deletions

@ -0,0 +1,47 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
to:
- '1'
cinder:
series: bionic
num_units: 1
options:
block-device: /dev/vdb
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

@ -0,0 +1,50 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-rocky
num_units: 1
to:
- '1'
cinder:
series: bionic
num_units: 1
options:
openstack-origin: cloud:bionic-rocky
block-device: /dev/vdb
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

@ -0,0 +1,50 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-stein
num_units: 1
to:
- '1'
cinder:
series: bionic
num_units: 1
options:
openstack-origin: cloud:bionic-stein
block-device: /dev/vdb
overwrite: "true"
ephemeral-unmount: /mnt
to:
- '2'
cinder-netapp:
charm: cinder-netapp
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

@ -0,0 +1,51 @@
series: bionic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: cloud:bionic-train
num_units: 1
to:
- '1'
cinder:
series: bionic
num_units: 1
storage:
block-devices: '40G'
options:
openstack-origin: cloud:bionic-train
block-device: None
overwrite: "true"
to:
- '2'
cinder-netapp:
charm: cinder-netapp
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
to:
- '3'

@ -26,27 +26,25 @@ applications:
- '0' - '0'
keystone: keystone:
charm: cs:~openstack-charmers-next/keystone charm: cs:~openstack-charmers-next/keystone
num_units: 1
options: options:
openstack-origin: cloud:bionic-ussuri openstack-origin: cloud:bionic-ussuri
num_units: 1
to: to:
- '1' - '1'
cinder: cinder:
charm: cs:~openstack-charmers-next/cinder series: bionic
num_units: 1 num_units: 1
storage:
block-devices: '40G'
options: options:
openstack-origin: cloud:bionic-ussuri openstack-origin: cloud:bionic-ussuri
block-device: None
overwrite: "true"
ephemeral-unmount: /mnt
to: to:
- '2' - '2'
cinder-netapp: cinder-netapp:
series: bionic
charm: cinder-netapp charm: cinder-netapp
options:
netapp-vserver: 'svm01'
netapp-server-hostname: '10.246.115.6'
netapp-server-port: '80'
netapp-login: 'vsadmin'
netapp-password: 'Ubuntu123'
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1 num_units: 1

@ -1,59 +1,70 @@
series: focal series: focal
variables:
openstack-origin: &openstack-origin distro
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
machines: machines:
'0': '0':
constraints: mem=3072M constraints: mem=3072M
'1': '1':
constraints: mem=3072M
'2': '2':
constraints: mem=3072M
'3': '3':
'4':
'5':
relations: relations:
- - keystone:shared-db - - keystone:shared-db
- mysql:shared-db - keystone-mysql-router:shared-db
- - cinder:shared-db - - keystone-mysql-router:db-router
- mysql:shared-db - mysql-innodb-cluster:db-router
- - cinder:identity-service - - cinder:shared-db
- keystone:identity-service - cinder-mysql-router:shared-db
- - cinder:amqp - - cinder-mysql-router:db-router
- rabbitmq-server:amqp - mysql-innodb-cluster:db-router
- - cinder:storage-backend - - cinder:identity-service
- cinder-netapp:storage-backend - keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications: applications:
mysql: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 1 num_units: 3
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options: options:
openstack-origin: distro source: *openstack-origin
to: to:
- '1' - '0'
cinder: - '1'
charm: cs:~openstack-charmers-next/cinder - '2'
num_units: 1
options:
openstack-origin: distro
to:
- '2'
cinder-netapp:
series: focal
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
netapp-vserver: 'hou-cloud'
netapp-server-hostname: '10.10.10.10'
volume-backend-name: cinder-netapp
netapp-server-port: 80
netapp-login: admin
netapp-password: Passw0rd
use-multipath: True
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
options:
openstack-origin: *openstack-origin
num_units: 1 num_units: 1
to: to:
- '3' - '4'
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
cinder:
num_units: 1
storage:
block-devices: '40G'
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '5'
cinder-netapp:
charm: cinder-netapp
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router

@ -1,58 +1,70 @@
series: focal series: focal
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
comment: comment:
- 'machines section to decide order of deployment. database sooner = faster' - 'machines section to decide order of deployment. database sooner = faster'
machines: machines:
'0': '0':
constraints: mem=3072M constraints: mem=3072M
'1': '1':
constraints: mem=3072M
'2': '2':
constraints: mem=3072M
'3': '3':
'4':
'5':
relations: relations:
- - keystone:shared-db - - keystone:shared-db
- mysql:shared-db - keystone-mysql-router:shared-db
- - cinder:shared-db - - keystone-mysql-router:db-router
- mysql:shared-db - mysql-innodb-cluster:db-router
- - cinder:identity-service - - cinder:shared-db
- keystone:identity-service - cinder-mysql-router:shared-db
- - cinder:amqp - - cinder-mysql-router:db-router
- rabbitmq-server:amqp - mysql-innodb-cluster:db-router
- - cinder:storage-backend - - cinder:identity-service
- cinder-netapp:storage-backend - keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications: applications:
mysql: mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/percona-cluster charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 1 num_units: 3
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options: options:
openstack-origin: distro source: *openstack-origin
to: to:
- '1' - '0'
cinder: - '1'
charm: cs:~openstack-charmers-next/cinder - '2'
num_units: 1
options:
openstack-origin: distro
to:
- '2'
cinder-netapp:
series: focal
charm: cinder-netapp
options:
netapp-storage-family: ontap_cluster
netapp-storage-protocol: iscsi
netapp-vserver: 'hou-cloud'
netapp-server-hostname: '10.10.10.10'
volume-backend-name: cinder-netapp
netapp-server-port: 80
netapp-login: admin
netapp-password: Passw0rd
use-multipath: True
rabbitmq-server: rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
options:
openstack-origin: *openstack-origin
num_units: 1 num_units: 1
to: to:
- '3' - '4'
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
cinder:
storage:
block-devices: '40G'
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '5'
cinder-netapp:
charm: cinder-netapp
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router

@ -0,0 +1,70 @@
series: groovy
variables:
openstack-origin: &openstack-origin distro
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
relations:
- - keystone:shared-db
- keystone-mysql-router:shared-db
- - keystone-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:shared-db
- cinder-mysql-router:shared-db
- - cinder-mysql-router:db-router
- mysql-innodb-cluster:db-router
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql-innodb-cluster:
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
to:
- '0'
- '1'
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
to:
- '3'
keystone:
charm: cs:~openstack-charmers/keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '4'
keystone-mysql-router:
charm: cs:~openstack-charmers/mysql-router
cinder:
storage:
block-devices: '40G'
num_units: 1
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '5'
cinder-netapp:
charm: cinder-netapp
cinder-mysql-router:
charm: cs:~openstack-charmers/mysql-router

@ -0,0 +1,56 @@
variables:
openstack-origin: &openstack-origin distro
series: hirsute
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
series: bionic
'1':
'2':
'3':
relations:
- - keystone:shared-db
- mysql:shared-db
- - cinder:shared-db
- mysql:shared-db
- - cinder:identity-service
- keystone:identity-service
- - cinder:amqp
- rabbitmq-server:amqp
- - cinder:storage-backend
- cinder-netapp:storage-backend
applications:
mysql:
charm: cs:~openstack-charmers-next/percona-cluster
num_units: 1
series: bionic
to:
- '0'
keystone:
charm: cs:~openstack-charmers-next/keystone
options:
openstack-origin: *openstack-origin
num_units: 1
to:
- '1'
cinder:
num_units: 1
storage:
block-devices: '40G'
options:
openstack-origin: *openstack-origin
block-device: None
overwrite: "true"
to:
- '2'
cinder-netapp:
charm: cinder-netapp
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
source: *openstack-origin
to:
- '3'

@ -0,0 +1,8 @@
applications:
cinder-netapp:
options:
netapp-vserver: {{ NETAPP_VSERVER }}
netapp-server-hostname: {{ NETAPP_SERVER_HOSTNAME }}
netapp-server-port: {{ NETAPP_SERVER_PORT }}
netapp-login: {{ NETAPP_LOGIN }}
netapp-password: {{ NETAPP_PASSWORD }}