Remove configs: dcosRepositoryURL, dcosClusterPackageListID, dcosProv…

…iderPackageID These parameters are not needed anymore since the bootstrap node support from acs-engine added in: Azure/acs-engine#2825
ionutbalutoiu · May 15, 2018 · 4676c30 · 4676c30
1 parent c4e2fe4
commit 4676c30
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/DCOS/acs-engine-dcos-deploy.sh b/DCOS/acs-engine-dcos-deploy.sh
@@ -30,13 +30,7 @@ validate_simple_deployment_params() {
         export DCOS_WINDOWS_BOOTSTRAP_URL="$CI_WEB_ROOT/dcos-windows/testing"
     fi
     if [[ -z $DCOS_BOOTSTRAP_URL ]]; then
-        export DCOS_BOOTSTRAP_URL="$CI_WEB_ROOT/dcos/bootstrap/latest.bootstrap.tar.xz"
-    fi
-    if [[ -z $DCOS_REPOSITORY_URL ]]; then
-        export DCOS_REPOSITORY_URL="$CI_WEB_ROOT/dcos"
-    fi
-    if [[ -z $DCOS_CLUSTER_PACKAGE_LIST_ID ]]; then
-        export DCOS_CLUSTER_PACKAGE_LIST_ID=$(curl -L $CI_WEB_ROOT/dcos/cluster-package-list.latest)
+        export DCOS_BOOTSTRAP_URL="$CI_WEB_ROOT/dcos/builds/latest/dcos_generate_config.sh"
     fi
 }
 

diff --git a/DCOS/templates/acs-engine/testing/hybrid.json b/DCOS/templates/acs-engine/testing/hybrid.json
@@ -5,9 +5,6 @@
       "orchestratorType": "DCOS",
       "orchestratorVersion": "1.11.0",
       "dcosConfig": {
-          "dcosRepositoryURL": "${DCOS_REPOSITORY_URL}",
-          "dcosClusterPackageListID": "${DCOS_CLUSTER_PACKAGE_LIST_ID}",
-          "dcosProviderPackageID": "${DCOS_AZURE_PROVIDER_PACKAGE_ID}",
           "dcosBootstrapURL": "${DCOS_BOOTSTRAP_URL}",
           "dcosWindowsBootstrapURL": "${DCOS_WINDOWS_BOOTSTRAP_URL}"
       }

diff --git a/DCOS/templates/acs-engine/testing/simple.json b/DCOS/templates/acs-engine/testing/simple.json
@@ -5,9 +5,6 @@
       "orchestratorType": "DCOS",
       "orchestratorVersion": "1.11.0",
       "dcosConfig": {
-          "dcosRepositoryURL": "${DCOS_REPOSITORY_URL}",
-          "dcosClusterPackageListID": "${DCOS_CLUSTER_PACKAGE_LIST_ID}",
-          "dcosProviderPackageID": "${DCOS_AZURE_PROVIDER_PACKAGE_ID}",
           "dcosBootstrapURL": "${DCOS_BOOTSTRAP_URL}",
           "dcosWindowsBootstrapURL": "${DCOS_WINDOWS_BOOTSTRAP_URL}"
       }