Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit c53d4fe

Browse files
Add --insecure flag to dcos-login. Enable external volumes by default. Add --disable-external-volumes flag. (#3321)
* Add --insecure to dcos-login * Enable external-volumes by default. Fix env-var references. * Remove Vertical Bursting patches for Cassandra.
1 parent 387ac71 commit c53d4fe

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def configure_universe(tmpdir_factory):
7676

7777
@pytest.fixture(scope="session", autouse=True)
7878
def configure_external_volumes():
79-
if is_env_var_set("EXTERNAL_VOLUMES_ENABLED", default=""):
79+
if is_env_var_set("ENABLE_EXTERNAL_VOLUMES", default=""):
8080
yield from sdk_external_volumes.external_volumes_session()
8181
else:
8282
yield

frameworks/cassandra/src/main/dist/svc.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,12 @@ pods:
103103
port: {{SECURE_JMX_RMI_PORT}}
104104
{{/TASKCFG_ALL_SECURE_JMX_ENABLED}}
105105
sidecar-resources:
106-
cpus: 0.01
106+
cpus: 1
107107
memory: 1024
108108
tasks:
109109
server:
110110
goal: RUNNING
111111
resource-set: server-resources
112-
resource-limits:
113-
cpus: unlimited
114112
cmd: |
115113
set -e
116114

test.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,12 @@ dind="false"
9494
interactive="false"
9595
package_registry="false"
9696
disable_diag_collect="false"
97-
enable_external_volumes="false"
97+
enable_external_volumes="true"
9898
docker_options="${DOCKER_OPTIONS:=}"
9999
docker_command="${DOCKER_COMMAND:=bash ${WORK_DIR}/tools/ci/test_runner.sh ${WORK_DIR}}"
100100
docker_image="${DOCKER_IMAGE:-mesosphere/dcos-commons:latest}"
101101
env_passthrough=
102102
env_file_input=
103-
external_volumes_enabed=false
104103

105104
################################################################################
106105
################################ CLI usage #####################################
@@ -274,6 +273,9 @@ while [[ ${#} -gt 0 ]]; do
274273
--enable-external-volumes)
275274
enable_external_volumes="true"
276275
;;
276+
--disable-external-volumes)
277+
enable_external_volumes="false"
278+
;;
277279
--dcos-files-path)
278280
if [[ ! -d "${2}" ]]; then echo "Directory not found: ${arg} ${2}"; exit 1; fi
279281
# Resolve abs path:

tools/dcos_login.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def configure_cli(
186186
# Attach to cluster via CLI
187187
dcos_run_cli("cluster attach {}".format(cluster_name))
188188
dcos_run_cli(
189-
"cluster setup --no-check {} --username {} --password {}".format(
189+
"cluster setup --insecure --no-check {} --username {} --password {}".format(
190190
dcosurl, dcos_login_username, dcos_login_password
191191
)
192192
)

0 commit comments

Comments
 (0)