openstack/deb-python-dcos
Code Issues Proposed changes

default to universe version-2.x during install

Browse Source
This commit is contained in:
Tamar Ben-Shachar
2016-02-22 10:31:59 -08:00
parent b8a9395ba1
commit 4402581758
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@@ -96,7 +96,7 @@ Configure Environment and Run
installation of DCOS:: installation of DCOS::
dcos config set core.dcos_url http://dcos-ea-1234.us-west-2.elb.amazonaws.com dcos config set core.dcos_url http://dcos-ea-1234.us-west-2.elb.amazonaws.com
dcos config append package.sources https://github.com/mesosphere/universe/archive/version-1.x.zip dcos config append package.sources https://universe.mesosphere.com/repo
dcos config set package.cache /tmp/dcos dcos config set package.cache /tmp/dcos
dcos package update dcos package update

2
bin/install/install-dcos-cli.sh
View File

@@ -114,7 +114,7 @@ dcos config set core.dcos_url $DCOS_URL
dcos config set core.ssl_verify false dcos config set core.ssl_verify false
dcos config set core.timeout 5 dcos config set core.timeout 5
dcos config set package.cache ~/.dcos/cache dcos config set package.cache ~/.dcos/cache
dcos config set package.sources '["https://github.com/mesosphere/universe/archive/version-1.x.zip"]' dcos config set package.sources '["https://universe.mesosphere.com/repo"]'
dcos package update dcos package update
ADD_PATH="" ADD_PATH=""

2
bin/install/install-optout-dcos-cli.sh
View File

@@ -115,7 +115,7 @@ dcos config set core.dcos_url $DCOS_URL
dcos config set core.ssl_verify false dcos config set core.ssl_verify false
dcos config set core.timeout 5 dcos config set core.timeout 5
dcos config set package.cache ~/.dcos/cache dcos config set package.cache ~/.dcos/cache
dcos config set package.sources '["https://github.com/mesosphere/universe/archive/version-1.x.zip"]' dcos config set package.sources '["https://universe.mesosphere.com/repo"]'
dcos package update dcos package update
ADD_PATH="" ADD_PATH=""

8
cli/tests/integrations/test_config.py
View File

@@ -180,12 +180,12 @@ def test_prepend_empty_list(env):
def test_append_list(env): def test_append_list(env):
_append_value( _append_value(
'package.sources', 'package.sources',
'https://github.com/mesosphere/universe/archive/version-2.x.zip', 'https://universe.mesosphere.com/repo',
env) env)
_get_value( _get_value(
'package.sources', 'package.sources',
['https://github.com/mesosphere/universe/archive/cli-test-3.zip', ['https://github.com/mesosphere/universe/archive/cli-test-3.zip',
'https://github.com/mesosphere/universe/archive/version-2.x.zip'], 'https://universe.mesosphere.com/repo'],
env) env)
config_unset('package.sources', '1', env) config_unset('package.sources', '1', env)
@@ -193,11 +193,11 @@ def test_append_list(env):
def test_prepend_list(env): def test_prepend_list(env):
_prepend_value( _prepend_value(
'package.sources', 'package.sources',
'https://github.com/mesosphere/universe/archive/version-2.x.zip', 'https://universe.mesosphere.com/repo',
env) env)
_get_value( _get_value(
'package.sources', 'package.sources',
['https://github.com/mesosphere/universe/archive/version-2.x.zip', ['https://universe.mesosphere.com/repo',
'https://github.com/mesosphere/universe/archive/cli-test-3.zip'], 'https://github.com/mesosphere/universe/archive/cli-test-3.zip'],
env) env)
config_unset('package.sources', '0', env) config_unset('package.sources', '0', env)

2
win_bin/install/install-dcos-cli.ps1
View File

@@ -104,7 +104,7 @@ dcos config set core.reporting true
dcos config set core.dcos_url $dcos_url dcos config set core.dcos_url $dcos_url
dcos config set core.timeout 5 dcos config set core.timeout 5
dcos config set package.cache $env:temp\dcos\package-cache dcos config set package.cache $env:temp\dcos\package-cache
dcos config set package.sources '[\"https://github.com/mesosphere/universe/archive/version-1.x.zip\"]' dcos config set package.sources '[\"https://universe.mesosphere.com/repo\"]'
dcos package update dcos package update