Merge lp://staging/~newell-jensen/maas/fix-1677933 into lp://staging/~maas-committers/maas/trunk
Proposed by
Newell Jensen
| Status: | Merged |
|---|---|
| Approved by: | Newell Jensen |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5924 |
| Proposed branch: | lp://staging/~newell-jensen/maas/fix-1677933 |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
644 lines (+101/-29) 14 files modified
src/maasserver/api/tests/test_pods.py (+1/-0) src/maasserver/forms/pods.py (+17/-0) src/maasserver/forms/tests/test_pods.py (+1/-0) src/maasserver/models/bmc.py (+13/-1) src/maasserver/models/tests/test_bmc.py (+4/-0) src/provisioningserver/drivers/pod/__init__.py (+2/-0) src/provisioningserver/drivers/pod/rsd.py (+7/-4) src/provisioningserver/drivers/pod/tests/test_base.py (+21/-8) src/provisioningserver/drivers/pod/tests/test_rsd.py (+7/-0) src/provisioningserver/drivers/pod/tests/test_virsh.py (+12/-8) src/provisioningserver/drivers/pod/virsh.py (+10/-8) src/provisioningserver/rpc/tests/test_arguments.py (+2/-0) src/provisioningserver/rpc/tests/test_clusterservice.py (+2/-0) src/provisioningserver/rpc/tests/test_pods.py (+2/-0) |
| To merge this branch: | bzr merge lp://staging/~newell-jensen/maas/fix-1677933 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Blake Rouse (community) | Approve | ||
| Mike Pontillo (community) | Needs Information | ||
|
Review via email:
|
|||
Commit message
Add hostname to pod discovered machines so that they will display their given hostnames, if legal. If they are not legal, a random hostname will be generated.
To post a comment you must log in.
Revision history for this message
| Newell Jensen (newell-jensen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
What happens if the pod contains a hostname that is already in MAAS?
It might be nice to try to substitute invalid characters with valid ones, but I won't block you on that.