Merge ~bladernr/+git/testflinger-docker:master into ~alanec/+git/testflinger-docker:master

Proposed by Jeff Lane 
Status: Needs review
Proposed branch: ~bladernr/+git/testflinger-docker:master
Merge into: ~alanec/+git/testflinger-docker:master
Diff against target: 33 lines (+3/-3)
3 files modified
sut/mokura.conf (+1/-1)
sut/mokura_snappy.yaml (+1/-1)
sut/rozary_snappy.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Adrian Lane Pending
Review via email: mp+423553@code.launchpad.net

Commit message

Fixed issues with Rozary and Mokura agent configs

Description of the change

Fixed issues with Rozary and Mokura agent configs

To post a comment you must log in.

Unmerged commits

1359274... by Jeff Lane 

[FIX] fix incorrect MAAS ID on Rozary: SERVCERT-372

0c252ab... by Jeff Lane 

[FIX] corrected misspelled hostname for mokura agent fixes: SERVCERT-374

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/sut/mokura.conf b/sut/mokura.conf
2index df7d529..b1d1279 100644
3--- a/sut/mokura.conf
4+++ b/sut/mokura.conf
5@@ -1,4 +1,4 @@
6-agent_id: makoura
7+agent_id: mokura
8 server_address: http://10.245.128.10:8000
9 global_timeout: 172800
10 output_timeout: 43200
11diff --git a/sut/mokura_snappy.yaml b/sut/mokura_snappy.yaml
12index 80af8eb..f7de38a 100644
13--- a/sut/mokura_snappy.yaml
14+++ b/sut/mokura_snappy.yaml
15@@ -1,6 +1,6 @@
16 device_ip: 10.245.130.41
17 node_id: yxrean
18-node_name: makoura
19+node_name: mokura
20 maas_user: testflinger_a
21 agent_name: makoura
22 env:
23diff --git a/sut/rozary_snappy.yaml b/sut/rozary_snappy.yaml
24index b36b3a3..0a8fefb 100644
25--- a/sut/rozary_snappy.yaml
26+++ b/sut/rozary_snappy.yaml
27@@ -1,5 +1,5 @@
28 device_ip: 10.245.130.44
29-node_id: 8yeh8a
30+node_id: fny73k
31 node_name: rozary
32 maas_user: testflinger_a
33 agent_name: rozary

Subscribers

People subscribed via source and target branches

to all changes: