diff options
| author | Martin Kosek <mkosek@redhat.com> | 2012-02-03 09:38:16 +0100 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-02-03 16:39:35 +0100 |
| commit | d1cfe47b6c9858c609ac86edd7426bbe64dc03ec (patch) | |
| tree | 313f71bfb45975e398f1682458881f3e7e71c7ff | |
| parent | 1abed1e4e9a520be36dd1885190f6a3b4c1d96c3 (diff) | |
| download | freeipa-d1cfe47b6c9858c609ac86edd7426bbe64dc03ec.tar.gz freeipa-d1cfe47b6c9858c609ac86edd7426bbe64dc03ec.tar.xz freeipa-d1cfe47b6c9858c609ac86edd7426bbe64dc03ec.zip | |
Improve migration help
Improve migration help topic so that it easier understandable:
- Add missing list of Topic commands
- Add one more example to demonstrate migration abilities
- Add breaks to too long lines to improve readibility
https://fedorahosted.org/freeipa/ticket/2174
| -rw-r--r-- | ipalib/cli.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/migration.py | 29 |
2 files changed, 22 insertions, 9 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index 667a7cdc4..ad835f291 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -818,7 +818,7 @@ class help(frontend.Local): raise HelpError(topic=topic) print doc - if len(commands) > 1: + if commands: print '' print unicode(_('Topic commands:')) for c in commands: diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 9fe72d587..688265fd3 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -67,18 +67,31 @@ EXAMPLES: The simplest migration, accepting all defaults: ipa migrate-ds ldap://ds.example.com:389 - Specify the user and group container. This can be used to migrate user and - group data from an IPA v1 server: - ipa migrate-ds --user-container='cn=users,cn=accounts' --group-container='cn=groups,cn=accounts' ldap://ds.example.com:389 + Specify the user and group container. This can be used to migrate user + and group data from an IPA v1 server: + ipa migrate-ds --user-container='cn=users,cn=accounts' \\ + --group-container='cn=groups,cn=accounts' \\ + ldap://ds.example.com:389 Since IPA v2 server already contain predefined groups that may collide with - groups in migrated (IPA v1) server (for example admins, ipausers), users having - colliding group as their primary group may happen to belong to an unknown group - on new IPA v2 server. + groups in migrated (IPA v1) server (for example admins, ipausers), users + having colliding group as their primary group may happen to belong to + an unknown group on new IPA v2 server. Use --group-overwrite-gid option to overwrite GID of already existing groups to prevent this issue: - ipa migrate-ds --group-overwrite-gid --user-container='cn=users,cn=accounts' --group-container='cn=groups,cn=accounts' ldap://ds.example.com:389 - + ipa migrate-ds --group-overwrite-gid \\ + --user-container='cn=users,cn=accounts' \\ + --group-container='cn=groups,cn=accounts' \\ + ldap://ds.example.com:389 + + Migrated users or groups may have object class and accompanied attributes + unknown to the IPA v2 server. These object classes and attributes may be + left out of the migration process: + ipa migrate-ds --user-container='cn=users,cn=accounts' \\ + --group-container='cn=groups,cn=accounts' \\ + --user-ignore-objectclass=radiusprofile \\ + --user-ignore-attribute=radiusgroupname \\ + ldap://ds.example.com:389 """) # USER MIGRATION CALLBACKS AND VARS |