@@ -110,16 +110,21 @@ def assert_keystone_is_responding(client):
110
110
if '{"versions": {"values":' not in resp .content :
111
111
raise AssertionError ('Got unexpected keystone page content: {}' .format (resp .content ))
112
112
113
+
113
114
def deploy_simple_server_to_new_model (
114
115
client , model_name , resource_contents = None , series = 'xenial' ):
115
116
# As per bug LP:1709773 deploy 2 primary apps and have a subordinate
116
117
# related to both
117
118
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
+
118
123
application = deploy_simple_resource_server (
119
- new_model , resource_contents , series )
124
+ new_model , resource_contents , series ,
125
+ )
120
126
_ , deploy_complete = new_model .deploy ('cs:ubuntu' , series = series )
121
127
new_model .wait_for (deploy_complete )
122
- new_model .deploy ('cs:nrpe' , series = series )
123
128
new_model .juju ('add-relation' , ('nrpe' , application ))
124
129
new_model .juju ('add-relation' , ('nrpe' , 'ubuntu' ))
125
130
# Need to wait for the subordinate charms too.
0 commit comments