Align k8s CoreOS template with atomic

[hongbin]

Currently, the k8s atomic template and k8s coreos template are in parity. This is because (i) contributors are used to contribute features to k8s atomic template only, and (ii) the core template are under maintain. We need to sync everything from atomic template to coreos template.

[Spyros Trigazis (strigazi)]

Removing assignee due to inactivity

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 6cb748d78019b2aad8de8ff89d0c0d2d41e4004f
Author: Hieu LE <email address hidden>
Date: Tue Aug 16 10:59:48 2016 +0700

    Align k8s CoreOS with atomic: add proxy config

    Adding http_proxy, https_proxy and no_proxy config for
    k8s CoreOS template file.

    Change-Id: I070d6584f26b40f1f0fb77af7dc096a490b0cc72
    Partial-Bug: #1490334

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/382150

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/382212

[OpenStack Infra (hudson-openstack)]

Change abandoned by yatin (<email address hidden>) on branch: stable/newton
Review: https://review.openstack.org/382212
Reason: Commited by mistake, original: https://review.openstack.org/#/c/382150/

[OpenStack Infra (hudson-openstack)]

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

commit 40c1e2de6f23ac0b2b62e432d5f2b7c150a1e9bb
Author: yatin <email address hidden>
Date: Wed Oct 5 10:51:40 2016 +0530

    [coreos] Allow k8s cluster without floating ip

    This patch allows k8s coreos cluster to be created
    without Floating IP resources.

    Depends-on: I51feb6ccdc0fab91a591568866e6801f2bbb319b
    Change-Id: Ifc8b6bde5a9bc3dd8c7e965e0450e2aa0d243263
    Partially-Implements: blueprint bay-with-no-floating-ips
    Closes-Bug: #1630189
    Partial-Bug: #1490334

[OpenStack Infra (hudson-openstack)]

Change abandoned by yatin (<email address hidden>) on branch: master
Review: https://review.openstack.org/374564
Reason: Will update this in next cycle