Enable focal and ussuri in the charm testing
Change-Id: Ifadd43b3b96adc93b46abe57200a8fdacb54447d
This commit is contained in:
parent
698f97fb1e
commit
03957f784a
|
@ -94,6 +94,8 @@ class WatcherCharm(openstack_charm.HAOpenStackCharm):
|
|||
'python-apt', # NOTE: workaround for hacluster subordinate
|
||||
]
|
||||
|
||||
python_version = 3
|
||||
|
||||
api_ports = {
|
||||
'watcher-api': {
|
||||
os_ip.PUBLIC: 9322,
|
||||
|
|
|
@ -12,6 +12,7 @@ tags:
|
|||
series:
|
||||
- bionic
|
||||
- eoan
|
||||
- focal
|
||||
subordinate: false
|
||||
requires:
|
||||
shared-db:
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
series: bionic
|
||||
relations:
|
||||
- - mysql:shared-db
|
||||
- keystone:shared-db
|
||||
- - mysql:shared-db
|
||||
- watcher:shared-db
|
||||
- - keystone:identity-service
|
||||
- watcher:identity-service
|
||||
- - rabbitmq-server:amqp
|
||||
- watcher:amqp
|
||||
applications:
|
||||
keystone:
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
mysql:
|
||||
constraints: mem=3072M
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
watcher:
|
||||
series: bionic
|
||||
charm: ../../../watcher
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-ussuri
|
||||
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"
|
||||
}
|
|
@ -0,0 +1,61 @@
|
|||
variables:
|
||||
openstack-origin: &openstack-origin distro
|
||||
|
||||
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'
|
|
@ -1,8 +1,10 @@
|
|||
charm_name: watcher
|
||||
gate_bundles:
|
||||
- bionic-train
|
||||
- bionic-ussuri
|
||||
- focal-ussuri
|
||||
smoke_bundles:
|
||||
- bionic-train
|
||||
- focal-ussuri
|
||||
configure:
|
||||
- zaza.charm_tests.noop.setup.basic_setup
|
||||
tests:
|
||||
|
|
Loading…
Reference in New Issue