Heat Template Indentation

[Daneyon Hansen]

Heat templates contain improper indentation. For example:

https://github.com/openstack/magnum/blob/master/magnum/templates/heat-kubernetes/fragments/enable-services-master.sh

All templates should be reviewed for indentation and updated accordingly.

[Daneyon Hansen (danehans)]

Quoting should be addressed also.

[Daneyon Hansen (danehans)]

^ https://github.com/openstack/magnum/blob/master/magnum/templates/heat-kubernetes/fragments/enable-services-master.sh#L6

[OpenStack Infra (hudson-openstack)]

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

[Daneyon Hansen (danehans)]

From Tom Cammann:

For vxlan conditional in magnum/templates/docker-swarm/fragments/write-network-config.sh

If jq is available use it instead to create/append json.
   jq -n --arg cidr "$FLANNEL_NETWORK_CIDR" \
       --arg len "$FLANNEL_NETWORK_SUBNETLEN" \
       '{"Network": $cidr, "Subnetlen": $len}' > $FLANNEL_JSON
   if [ "$use_vxlan" = 1 ]; then
        jq '. + {"Backend": {"Type": "vxlan"}}' < $FLANNEL_JSON
   fi

[OpenStack Infra (hudson-openstack)]

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

commit 485d9a90189b8608a858eb2e85fbe0dda24bc775
Author: Zachary Sais <email address hidden>
Date: Sat Oct 17 16:52:19 2015 -0500

    Cleanup template formatting

    This patch is meant to cleanup indentations in the templates, as
    well some other house keeping fixes.

    Closes-Bug: #1504685
    Change-Id: I43f6cca8f449dea2db4de6a5308bfa5e4551838e