Merge lp:~mpontillo/maas/fix-shared-secret-messaging-packaging-1588116 into lp:~maas-maintainers/maas/packaging

Proposed by Mike Pontillo on 2016-06-02
Status: Merged
Approved by: Mike Pontillo on 2016-06-07
Approved revision: 497
Merged at revision: 497
Proposed branch: lp:~mpontillo/maas/fix-shared-secret-messaging-packaging-1588116
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 39 lines (+9/-7)
3 files modified
debian/maas-common.templates (+3/-2)
debian/maas-rack-controller.templates (+3/-2)
debian/maas-rack-udeb.templates (+3/-3)
To merge this branch: bzr merge lp:~mpontillo/maas/fix-shared-secret-messaging-packaging-1588116
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) 2016-06-02 Approve on 2016-06-07
Newell Jensen (community) 2016-06-02 Approve on 2016-06-02
Review via email: mp+296349@code.launchpad.net

Commit message

Make messaging consistent for inputting the shared secret on the rack controller.

To post a comment you must log in.
Newell Jensen (newell-jensen) wrote :

Looks good!

review: Approve
Mike Pontillo (mpontillo) wrote :

Also, should the type really be 'password'? It's kind of annoying to input a huge shared secret when it's fully obscured. I suspect if it were being relayed over the phone, there would be many curses spoken in our general direction. ;-)

Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/maas-common.templates'
2--- debian/maas-common.templates 2016-04-21 02:42:48 +0000
3+++ debian/maas-common.templates 2016-06-02 16:37:33 +0000
4@@ -49,5 +49,6 @@
5 Template: maas-rack-controller/shared-secret
6 Type: password
7 _Description: MAAS Rack Controller Shared Secret:
8- The MAAS Rack Controller needs to contact the MAAS server
9- with a share secret. Set the shared secret here.
10+ The MAAS rack controller needs to contact the MAAS region controller
11+ with the shared secret found in /var/lib/maas/secret on the region controller.
12+ Set the shared secret here.
13
14=== modified file 'debian/maas-rack-controller.templates'
15--- debian/maas-rack-controller.templates 2016-04-21 02:42:48 +0000
16+++ debian/maas-rack-controller.templates 2016-06-02 16:37:33 +0000
17@@ -10,5 +10,6 @@
18 Template: maas-rack-controller/shared-secret
19 Type: password
20 _Description: MAAS Rack Controller Shared Secret:
21- The MAAS Rack Controller needs to contact the MAAS server
22- with a share secret. Set the shared secret here.
23+ The MAAS rack controller needs to contact the MAAS region controller
24+ with the shared secret found in /var/lib/maas/secret on the region controller.
25+ Set the shared secret here.
26
27=== modified file 'debian/maas-rack-udeb.templates'
28--- debian/maas-rack-udeb.templates 2016-04-13 13:28:03 +0000
29+++ debian/maas-rack-udeb.templates 2016-06-02 16:37:33 +0000
30@@ -29,6 +29,6 @@
31 Template: maas-rack-udeb/shared-secret
32 Type: password
33 _Description: MAAS Rack Controller shared secret:
34- The MAAS Rack Controller needs to contact the MAAS server
35- with a share secret. This shared secret can be found on
36- the MAAS Region Controller server under /var/lib/maas/secret.
37+ The MAAS rack controller needs to contact the MAAS region controller
38+ with the shared secret found in /var/lib/maas/secret on the region controller.
39+ Set the shared secret here.

Subscribers

People subscribed via source and target branches