>From 5ad2103038f8109906764d108af8422c1fef694e Mon Sep 17 00:00:00 2001 From: Rowland Penny Date: Mon, 6 Jun 2016 15:43:59 +0100 Subject: [PATCH 1/5] samba-tool domain provision, mark '--server-role' option as depreciated and don't ask for server_role if run interactively. Signed-off-by: Rowland Penny --- python/samba/netcmd/domain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index fd26d93..703441b 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -221,7 +221,7 @@ class cmd_domain_provision(Command): choices=["fedora-ds", "openldap"]), Option("--server-role", type="choice", metavar="ROLE", choices=["domain controller", "dc", "member server", "member", "standalone"], - help="The server role (domain controller | dc | member server | member | standalone). Default is dc.", + help="The server role (domain controller | dc | member server | member | standalone). Default is dc. (depreciated)", default="domain controller"), Option("--function-level", type="choice", metavar="FOR-FUN-LEVEL", choices=["2000", "2003", "2008", "2008_R2"], @@ -348,7 +348,7 @@ class cmd_domain_provision(Command): if domain is None: raise CommandError("No domain set!") - server_role = ask("Server Role (dc, member, standalone)", "dc") + server_role = "dc" dns_backend = ask("DNS backend (SAMBA_INTERNAL, BIND9_FLATFILE, BIND9_DLZ, NONE)", "SAMBA_INTERNAL") if dns_backend in (None, ''): -- 1.7.10.4