openstack
/
magnum
Code Issues Proposed changes

Merge "Update swarm discovery url"

This commit is contained in:
Jenkins 2015-09-11 10:48:50 +00:00 committed by Gerrit Code Review
parent 8a120812ab 89153303b7
commit 6a243c2326
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/magnum/magnum.conf.sample
View File

@ -13,7 +13,7 @@
# Directory where the magnum python module is installed. (string
# value)
#pybasedir = /home/test/magnum/magnum
#pybasedir = /opt/stack/magnum/magnum
# Directory where magnum binaries are installed. (string value)
#bindir = $pybasedir/bin
@ -236,7 +236,7 @@
# From magnum
#
# The port for the Magnum API server. (integer value)
# The port for the Magnum API server. (port number)
# Minimum value: 1
# Maximum value: 65535
#port = 9511
@ -300,7 +300,7 @@
#public_swarm_discovery = true
# Url for swarm public discovery endpoint. (string value)
#public_swarm_discovery_url = https://discovery-stage.hub.docker.com/v1/clusters
#public_swarm_discovery_url = https://discovery.hub.docker.com/v1/clusters
# Location of template to build a Mesos cluster on Ubuntu. (string
# value)
@ -729,7 +729,7 @@
# value)
#k8s_protocol = http
# Default port of the k8s master endpoint. (integer value)
# Default port of the k8s master endpoint. (port number)
# Minimum value: 1
# Maximum value: 65535
#k8s_port = 8080

2
magnum/conductor/template_definition.py
View File

@ -65,7 +65,7 @@ template_def_opts = [
help=_('Indicates Swarm discovery should use public '
'endpoint.')),
cfg.StrOpt('public_swarm_discovery_url',
default='https://discovery-stage.hub.docker.com/v1/clusters',
default='https://discovery.hub.docker.com/v1/clusters',
help=_('Url for swarm public discovery endpoint.')),
cfg.StrOpt('mesos_ubuntu_template_path',
default=paths.basedir_def('templates/heat-mesos/'