Skip to content

Commit efcf814

Browse files
committed
Add nagios to consume nrpe because nrpe will be blocked forever if there is no consumers;
1 parent a524d25 commit efcf814

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

acceptancetests/jujupy/workloads.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,21 @@ def assert_keystone_is_responding(client):
110110
if '{"versions": {"values":' not in resp.content:
111111
raise AssertionError('Got unexpected keystone page content: {}'.format(resp.content))
112112

113+
113114
def deploy_simple_server_to_new_model(
114115
client, model_name, resource_contents=None, series='xenial'):
115116
# As per bug LP:1709773 deploy 2 primary apps and have a subordinate
116117
# related to both
117118
new_model = client.add_model(client.env.clone(model_name))
119+
new_model.deploy('cs:nrpe', series=series)
120+
new_model.deploy('cs:nagios', series=series)
121+
new_model.juju('add-relation', ('nrpe:monitors', 'nagios:monitors'))
122+
118123
application = deploy_simple_resource_server(
119-
new_model, resource_contents, series)
124+
new_model, resource_contents, series,
125+
)
120126
_, deploy_complete = new_model.deploy('cs:ubuntu', series=series)
121127
new_model.wait_for(deploy_complete)
122-
new_model.deploy('cs:nrpe', series=series)
123128
new_model.juju('add-relation', ('nrpe', application))
124129
new_model.juju('add-relation', ('nrpe', 'ubuntu'))
125130
# Need to wait for the subordinate charms too.

0 commit comments

Comments
 (0)