Add support for Victoria

This patch adds support for Victoria and adds relevant testcases
as well.

Change-Id: Id358d8c7d7e73d9035fa12db00a421bf715b0c55
Signed-off-by: Stamatis Katsaounis <skatsaounis@admin.grnet.gr>
This commit is contained in:
Stamatis Katsaounis 2020-11-09 21:02:23 +02:00
parent 27f3386fe9
commit f55c13932e
4 changed files with 129 additions and 0 deletions

View File

@ -124,6 +124,7 @@ class WatcherCharm(openstack_charm.HAOpenStackCharm):
'watcher-common': collections.OrderedDict([
('3', 'train'),
('4', 'ussuri'),
('5', 'victoria'),
]),
}

View File

@ -0,0 +1,61 @@
variables:
openstack-origin: &openstack-origin cloud:focal-victoria
series: &series focal
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
watcher-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
watcher:
series: *series
charm: ../../../watcher
num_units: 1
options:
openstack-origin: *openstack-origin
datasources: gnocchi
planner: weight
planner-config: >
{
"weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60",
"parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2"
}
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'watcher:shared-db'
- 'watcher-mysql-router:shared-db'
- - 'watcher-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'watcher:identity-service'
- - 'rabbitmq-server:amqp'
- 'watcher:amqp'

View File

@ -0,0 +1,61 @@
variables:
openstack-origin: &openstack-origin distro
series: &series groovy
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
watcher-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
keystone:
charm: cs:~openstack-charmers-next/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
watcher:
series: *series
charm: ../../../watcher
num_units: 1
options:
openstack-origin: *openstack-origin
datasources: gnocchi
planner: weight
planner-config: >
{
"weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60",
"parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2"
}
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'watcher:shared-db'
- 'watcher-mysql-router:shared-db'
- - 'watcher-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'keystone:identity-service'
- 'watcher:identity-service'
- - 'rabbitmq-server:amqp'
- 'watcher:amqp'

View File

@ -3,9 +3,15 @@ gate_bundles:
- bionic-train
- bionic-ussuri
- focal-ussuri
- focal-victoria
smoke_bundles:
- focal-ussuri
configure:
- zaza.charm_tests.noop.setup.basic_setup
tests:
- zaza.charm_tests.noop.tests.NoopTest
dev_bundles:
- groovy-victoria
tests_options:
force_deploy:
- groovy-victoria