def provision(setup_dir, message, session_info,
credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None,
rootdn=None, domaindn=None, schemadn=None, configdn=None,
- domain=None, hostname=None, hostip=None, domainsid=None,
- adminpass=None, krbtgtpass=None, domainguid=None,
- domain=None, hostname=None, hostip=None, hostip6=None, domainsid=None,
- hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None,
++ domain=None, hostname=None, hostip=None, hostip6=None,
++ domainsid=None, adminpass=None, krbtgtpass=None, domainguid=None,
policyguid=None, invocationid=None, machinepass=None,
dnspass=None, root=None, nobody=None, nogroup=None, users=None,
wheel=None, backup=None, aci=None, serverrole=None,
parser.add_option("--host-name", type="string", metavar="HOSTNAME",
help="set hostname")
parser.add_option("--host-ip", type="string", metavar="IPADDRESS",
++<<<<<<< HEAD:source/setup/provision
+ help="set ipaddress")
++=======
+ help="set IPv4 ipaddress")
+ parser.add_option("--host-ip6", type="string", metavar="IP6ADDRESS",
+ help="set IPv6 ipaddress")
+ parser.add_option("--host-guid", type="string", metavar="GUID",
+ help="set hostguid (otherwise random)")
+ parser.add_option("--invocationid", type="string", metavar="GUID",
+ help="set invocationid (otherwise random)")
++>>>>>>> 8585a3c77d5dfe97bca3f08716fc06ac2819f578:source/setup/provision
parser.add_option("--adminpass", type="string", metavar="PASSWORD",
help="choose admin password (otherwise random)")
parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD",
samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
domainguid=opts.domain_guid, domainsid=opts.domain_sid,
policyguid=opts.policy_guid, hostname=opts.host_name,
- hostip=opts.host_ip,
- hostip=opts.host_ip, hostip6=opts.host_ip6, hostguid=opts.host_guid,
++ hostip=opts.host_ip, hostip6=opts.host_ip6,
invocationid=opts.invocationid, adminpass=opts.adminpass,
krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,