swarm not works with etcd behind proxy

[Eli Qiao]

commit de1edaec403bc9374eee3226dfd9e25bea2c6ded
Author: Daneyon Hansen <email address hidden>
Date: Tue Nov 17 22:11:19 2015 +0000

    Changes Swarm Bootstrapping from Public to Etcd

    Previously, Swarm leveraged Docker's public discovery mechanism
    for bootstrapping a cluster. Etcd bootstrapping is supported by
    Swarm and is preferred for production use for the following reasons:

    1. Required for HA.
    2. Is more secure.
    3. Required for the Flannel network-driver.

    Partially-Implements: blueprint extend-baymodel-net-attributes
    Partially-Implements: blueprint conductor-template-net-update

    Change-Id: Iab844c03ed7cf8bbee69b72ff71c219f0a5ab1dd

This commit changes to using etcd as bootstrapping, but forget to add
proxy when configure etcd service.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/248554
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=27cec826f5ac2a970f0c446ea8f3300ff4a96ab4
Submitter: Jenkins
Branch: master

commit 27cec826f5ac2a970f0c446ea8f3300ff4a96ab4
Author: Eli Qiao <email address hidden>
Date: Mon Nov 23 15:26:00 2015 +0800

    Swarm: add proxy for etcd service

    This commit changes to using etcd as bootstrapping, but forget to add
    proxy when configure etcd service.

    Closes-Bug: #1518857
    Change-Id: I09ab343c7608af9fc93df2221ea97a31d0b05cb4