s4-provision: Make s3fs the default way to install a new Samba4 DC

With s3fs now well settled into master, we now throw the swtich and make
it the default.

There is still much to do, but we need to be using s3fs by default to
find out exactly what that is.

Andrew Bartlett

2 files changed, 3 insertions, 2 deletions

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1e53c21dec..4622f8ef43 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -535,6 +535,7 @@ sub provision_raw_prepare($$$$$$$$$)
 	push (@provision_options, "--server-role=\"$ctx->{server_role}\"");
 	push (@provision_options, "--function-level=\"$ctx->{functional_level}\"");
 	push (@provision_options, "--dns-backend=BIND9_DLZ");
+	push (@provision_options, "--use-ntvfs");
 
 	@{$ctx->{provision_options}} = @provision_options;
 
diff --git a/source4/setup/provision b/source4/setup/provision
index a9d71cde6b..32edff320c 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -125,7 +125,7 @@ parser.add_option("--ol-mmr-urls", type="string", metavar="LDAPSERVER",
 parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH",
         help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.")
 parser.add_option("--use-xattrs", type="choice", choices=["yes", "no", "auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto")
-parser.add_option("--use-s3fs", action="store_true", help="Use s3fs for the fileserver (default = no)")
+parser.add_option("--use-ntvfs", action="store_true", help="Use NTVFS for the fileserver (default = no)")
 
 opts = parser.parse_args()[0]
 
@@ -260,7 +260,7 @@ try:
           backend_type=opts.ldap_backend_type,
           ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
           slapd_path=opts.slapd_path, 
-          useeadb=eadb, next_rid=opts.next_rid, lp=lp, use_ntvfs=(not opts.use_s3fs))
+          useeadb=eadb, next_rid=opts.next_rid, lp=lp, use_ntvfs=(opts.use_ntvfs))
 except ProvisioningError, e:
     print str(e)
     sys.exit(1)