Update swarm discovery url

[hongbin]

The swarm discovery url has been updated in upstream https://github.com/docker/swarm/commit/6678a167fe873a320d00aa99be09945ac5f9ca96 . Magnum needs to be in sync.

In particular, the public_swarm_discovery_url in template definition (/opt/stack/magnum/magnum/conductor/template_definition.py) needs to be updated.

The sample config file (/opt/stack/magnum/etc/magnum/magnum.conf.sample) needs to be re-generated (tox -egenconfig).

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/221652

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/221652
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=89153303b76c6e73619ce045a13af81fc7c85579
Submitter: Jenkins
Branch: master

commit 89153303b76c6e73619ce045a13af81fc7c85579
Author: mathspanda <email address hidden>
Date: Wed Sep 9 17:03:12 2015 +0800

    Update swarm discovery url

    The swarm discovery url has been updated in upstream https://github.
    com/docker/swarm/commit/6678a167fe873a320d00aa99be09945ac5f9ca96.
    Magnum needs to be in sync. And the magnum.conf.sample needs to be
    re-generated.

    Change-Id: I922af4e784a1a533c92e9dd0665e5b06199b4786
    Closes-Bug: #1493553