openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Fix blocked 'nrpe' after test bundle deployment 

Since https://git.launchpad.net/charm-nrpe/commit/?id=f7aa963d nrpe
will remain in blocked state if not related to a nagios application.

Change-Id: I04eabafcbb1000991b6ee3c8e7bc481903c3fe35
This commit is contained in:
Aurelien Lourot 2020-08-29 11:03:08 +02:00
parent 4bbb5a8cc0
commit ba5929e733
13 changed files with 83 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/bundles/bionic-queens.yaml
View File

@ -11,6 +11,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -37,5 +39,8 @@ applications:
num_units: 1
options:
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/bionic-rocky.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/bionic-stein.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/bionic-train.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/bionic-ussuri.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

11
tests/bundles/focal-ussuri.yaml
View File

@ -17,6 +17,8 @@ machines:
'5':
'6':
'7':
'8':
series: bionic # nagios not supported on focal yet
applications:
@ -70,6 +72,13 @@ applications:
to:
- '7'
nagios:
charm: cs:nagios
series: bionic # not supported on focal yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
@ -89,3 +98,5 @@ relations:
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

11
tests/bundles/focal-victoria.yaml
View File

@ -17,6 +17,8 @@ machines:
'5':
'6':
'7':
'8':
series: bionic # nagios not supported on focal yet
applications:
@ -70,6 +72,13 @@ applications:
to:
- '7'
nagios:
charm: cs:nagios
series: bionic # not supported on focal yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
@ -89,3 +98,5 @@ relations:
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

11
tests/bundles/groovy-victoria.yaml
View File

@ -17,6 +17,8 @@ machines:
'5':
'6':
'7':
'8':
series: bionic # nagios not supported on focal+ yet
applications:
@ -70,6 +72,13 @@ applications:
to:
- '7'
nagios:
charm: cs:nagios
series: bionic # not supported on focal+ yet
num_units: 1
to:
- '8'
nrpe:
charm: cs:nrpe
@ -89,3 +98,5 @@ relations:
- 'mysql-innodb-cluster:db-router'
- - 'nrpe:nrpe-external-master'
- 'rabbitmq-server:nrpe-external-master'
- - 'nrpe:monitors'
- 'nagios:monitors'

5
tests/bundles/trusty-mitaka.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/xenial-mitaka.yaml
View File

@ -11,6 +11,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -37,5 +39,8 @@ applications:
num_units: 1
options:
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/xenial-ocata.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/xenial-pike.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe

5
tests/bundles/xenial-queens.yaml
View File

@ -14,6 +14,8 @@ relations:
- percona-cluster:shared-db
- - nrpe:nrpe-external-master
- rabbitmq-server:nrpe-external-master
- - nrpe:monitors
- nagios:monitors
applications:
rabbitmq-server:
@ -44,5 +46,8 @@ applications:
options:
openstack-origin: *openstack-origin
admin-password: openstack
nagios:
charm: cs:nagios
num_units: 1
nrpe:
charm: cs:nrpe