MAAS

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

  1. fix-shared-secret-messaging-packaging-1588116
  2. Merge into packaging
Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
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) Approve
Newell Jensen (community) Approve
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.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Looks good!

review: Approve
Revision history for this message
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. ;-)

Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/maas-common.templates'
--- debian/maas-common.templates 2016-04-21 02:42:48 +0000
+++ debian/maas-common.templates 2016-06-02 16:37:33 +0000
@@ -49,5 +49,6 @@
49Template: maas-rack-controller/shared-secret49Template: maas-rack-controller/shared-secret
50Type: password50Type: password
51_Description: MAAS Rack Controller Shared Secret:51_Description: MAAS Rack Controller Shared Secret:
52 The MAAS Rack Controller needs to contact the MAAS server52 The MAAS rack controller needs to contact the MAAS region controller
53 with a share secret. Set the shared secret here.53 with the shared secret found in /var/lib/maas/secret on the region controller.
54 Set the shared secret here.
5455
=== modified file 'debian/maas-rack-controller.templates'
--- debian/maas-rack-controller.templates 2016-04-21 02:42:48 +0000
+++ debian/maas-rack-controller.templates 2016-06-02 16:37:33 +0000
@@ -10,5 +10,6 @@
10Template: maas-rack-controller/shared-secret10Template: maas-rack-controller/shared-secret
11Type: password11Type: password
12_Description: MAAS Rack Controller Shared Secret:12_Description: MAAS Rack Controller Shared Secret:
13 The MAAS Rack Controller needs to contact the MAAS server13 The MAAS rack controller needs to contact the MAAS region controller
14 with a share secret. Set the shared secret here.14 with the shared secret found in /var/lib/maas/secret on the region controller.
15 Set the shared secret here.
1516
=== modified file 'debian/maas-rack-udeb.templates'
--- debian/maas-rack-udeb.templates 2016-04-13 13:28:03 +0000
+++ debian/maas-rack-udeb.templates 2016-06-02 16:37:33 +0000
@@ -29,6 +29,6 @@
29Template: maas-rack-udeb/shared-secret29Template: maas-rack-udeb/shared-secret
30Type: password30Type: password
31_Description: MAAS Rack Controller shared secret:31_Description: MAAS Rack Controller shared secret:
32 The MAAS Rack Controller needs to contact the MAAS server32 The MAAS rack controller needs to contact the MAAS region controller
33 with a share secret. This shared secret can be found on33 with the shared secret found in /var/lib/maas/secret on the region controller.
34 the MAAS Region Controller server under /var/lib/maas/secret.34 Set the shared secret here.

Subscribers

People subscribed via source and target branches