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

Commit

Permalink
Add --insecure flag to dcos-login. Enable external volumes by default…
Browse files Browse the repository at this point in the history
…. 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.
  • Loading branch information
kaiwalyajoshi authored Nov 5, 2020
1 parent 387ac71 commit c53d4fe
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def configure_universe(tmpdir_factory):

@pytest.fixture(scope="session", autouse=True)
def configure_external_volumes():
if is_env_var_set("EXTERNAL_VOLUMES_ENABLED", default=""):
if is_env_var_set("ENABLE_EXTERNAL_VOLUMES", default=""):
yield from sdk_external_volumes.external_volumes_session()
else:
yield
Expand Down
4 changes: 1 addition & 3 deletions frameworks/cassandra/src/main/dist/svc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,12 @@ pods:
port: {{SECURE_JMX_RMI_PORT}}
{{/TASKCFG_ALL_SECURE_JMX_ENABLED}}
sidecar-resources:
cpus: 0.01
cpus: 1
memory: 1024
tasks:
server:
goal: RUNNING
resource-set: server-resources
resource-limits:
cpus: unlimited
cmd: |
set -e
Expand Down
6 changes: 4 additions & 2 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,12 @@ dind="false"
interactive="false"
package_registry="false"
disable_diag_collect="false"
enable_external_volumes="false"
enable_external_volumes="true"
docker_options="${DOCKER_OPTIONS:=}"
docker_command="${DOCKER_COMMAND:=bash ${WORK_DIR}/tools/ci/test_runner.sh ${WORK_DIR}}"
docker_image="${DOCKER_IMAGE:-mesosphere/dcos-commons:latest}"
env_passthrough=
env_file_input=
external_volumes_enabed=false

################################################################################
################################ CLI usage #####################################
Expand Down Expand Up @@ -274,6 +273,9 @@ while [[ ${#} -gt 0 ]]; do
--enable-external-volumes)
enable_external_volumes="true"
;;
--disable-external-volumes)
enable_external_volumes="false"
;;
--dcos-files-path)
if [[ ! -d "${2}" ]]; then echo "Directory not found: ${arg} ${2}"; exit 1; fi
# Resolve abs path:
Expand Down
2 changes: 1 addition & 1 deletion tools/dcos_login.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def configure_cli(
# Attach to cluster via CLI
dcos_run_cli("cluster attach {}".format(cluster_name))
dcos_run_cli(
"cluster setup --no-check {} --username {} --password {}".format(
"cluster setup --insecure --no-check {} --username {} --password {}".format(
dcosurl, dcos_login_username, dcos_login_password
)
)
Expand Down

0 comments on commit c53d4fe

Please sign in to comment.