swarm agent and master does not use right no_proxy settings

[Kevin Lefevre]

In swarm agent and swarm master system unit, NO_PROXY is set to $NO_PROXY but it should be set to SWARM MASTER, ETCD ,SWARM NODE like in add-proxy.sh

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit a24de0a536404d26120fbb9bc8121ab673ac299d
Author: Kevin Lefevre <email address hidden>
Date: Tue Jan 31 10:21:20 2017 +0100

    Use right no proxy settings for swarm master and agent

    Change-Id: I6a920a189264bf4c306be44399caa25537d4a0ce
    Closes-Bug: 1660562

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/magnum 4.1.0 release.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/457806
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=35dc923d66213edebf7db122dd929d79a8eb4cf7
Submitter: Jenkins
Branch: master

commit 35dc923d66213edebf7db122dd929d79a8eb4cf7
Author: Michael Tupitsyn <email address hidden>
Date: Mon Apr 17 15:39:45 2017 -0700

    Fix no_proxy evaluation for Swarm clusters

    At the moment, no_proxy variable is evaluated separately for docker
    daemon and for swarm-manager container running in docker. Evaluated
    value for swarm-manager is not getting into cloud-init script, because
    $NODE_PROXY token is getting replaced by Heat str_replace function.
    This commit is intended to unify NO_PROXY evaluation and also fix the
    issue with swarm-manager.

    Related-Bug: #1647815
    Related-Bug: #1632698
    Related-Bug: #1660562
    Change-Id: I336024265008b6cae308bf7b614476b71b81fa01

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/pike
Review: https://review.openstack.org/497529

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/497529
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=464186b7fa85905c2d27c798b3d05c15f292c064
Submitter: Jenkins
Branch: stable/pike

commit 464186b7fa85905c2d27c798b3d05c15f292c064
Author: Michael Tupitsyn <email address hidden>
Date: Mon Apr 17 15:39:45 2017 -0700

    Fix no_proxy evaluation for Swarm clusters

    At the moment, no_proxy variable is evaluated separately for docker
    daemon and for swarm-manager container running in docker. Evaluated
    value for swarm-manager is not getting into cloud-init script, because
    $NODE_PROXY token is getting replaced by Heat str_replace function.
    This commit is intended to unify NO_PROXY evaluation and also fix the
    issue with swarm-manager.

    Related-Bug: #1647815
    Related-Bug: #1632698
    Related-Bug: #1660562
    Change-Id: I336024265008b6cae308bf7b614476b71b81fa01
    (cherry picked from commit 35dc923d66213edebf7db122dd929d79a8eb4cf7)