Pull in updates from larsks heat template repo

[Adrian Otto]

Cherry-pick updates from the larsks heat template code for inclusion with Magnum.

[Adrian Otto (aotto)]

https://github.com/larsks/heat-kubernetes

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/152985
Committed: https://git.openstack.org/cgit/stackforge/magnum/commit/?id=108bb361afc45b18a0bb0b866b53d11d2746d77e
Submitter: Jenkins
Branch: master

commit 108bb361afc45b18a0bb0b866b53d11d2746d77e
Author: digambar <email address hidden>
Date: Wed Feb 4 22:38:16 2015 +0530

    Pull in updates from larsks heat template repo

    These were the commits pulled from larsks github repo(s)

    ef48d0 configure flannel via systemd unit
    4e1b7a Merge pull request #11 from hongbin/replacement_policy
    02ea53 Set port replacement_policy to AUTO
    b06de8 call daemon-reload before starting services
    c265dd fix json syntax problem
    88a8bd configure cinder volume for docker storage
    7ae6e5 default server_image wasn't useful
    809d9b updated requirements in README
    6595da integrate wait-for-flanneld into docker.service.yaml
    cb51ae use flanneld sysconfig for etcd url
    6cf8b9 added note re: vxlan backend issues on centos
    18d9c6 make portal_net address range a parameter
    343bde added license
    efb341 add fix for docker/docker#9468
    b235dc use less confusing name for flannel json config
    08d873 make vxlan support conditional (+ doc updates)
    daee9e permit kube api access via services
    747d06 add a "minion" default user
    b1c36c refactor config using software config support
    0d981d use centos atomic host
    538f7a remove get-image.sh

    Change-Id: Ibd22a2805328ef76ad3996113b10e82cc1a16a9b
    Closes-Bug: 1417642

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit cd3190758f786c53fa978d4b3389e9fb4534435c
Author: Hongbin Lu <email address hidden>
Date: Sat Mar 7 17:08:03 2015 +0000

    Pull updates from larsks heat-kubernetes repo

    Below is the list of commits being pulled
    * Merge pull request #12 from takac/master
      larsks/heat-kubernetes@90120c9c985052c6546b3421384e56b97a0cba4f
    * Add master flavor param to kubecluster
      larsks/heat-kubernetes@78fba1527babb19ef01d1fc31d0a8fe0eb0b20bf
    * Allow specification docker volume size
      larsks/heat-kubernetes@7459b176a8c0013360d654d7361c6c8babe2e636

    Change-Id: I215234f223dd898e94612d4ff9ca1e1e148dd8c4
    Closes-Bug: 1417642