Change DCOS_CONFIG_PATH default to etc/config.yaml so that it always …

…prompts for configuration

- Avoid delayed failure caused by incompatible dcos config

.gitignore

@@ -1,11 +1,10 @@
 .DS_Store
 .idea
-dcos_generate_config*.sh
-exhibitor.properties
 .vagrant
+exhibitor.properties
 dcos
 provision/jre-*-linux-x64.tgz
-packer_cache
-output-virtualbox-iso
-*.box
+
+dcos_generate_config*.sh
+/etc/config.yaml
 /VagrantConfig.yaml

Vagrantfile

@@ -13,7 +13,7 @@ $user_config = {
   box_version:    ENV.fetch("DCOS_BOX_VERSION", "~> 0.3"),
 
   vm_config_path:       ENV.fetch("DCOS_VM_CONFIG_PATH", "VagrantConfig.yaml"),
-  config_path:          ENV.fetch("DCOS_CONFIG_PATH", "etc/1_master-config-1.5.yaml"),
+  config_path:          ENV.fetch("DCOS_CONFIG_PATH", "etc/config.yaml"),
   generate_config_path: ENV.fetch("DCOS_GENERATE_CONFIG_PATH", "dcos_generate_config.sh"),
   java_enabled:         ENV.fetch("DCOS_JAVA_ENABLED", "false"),
   private_registry:     ENV.fetch("DCOS_PRIVATE_REGISTRY", "false"),