Comment 2 for bug 1652184

Reviewed: https://review.openstack.org/418273
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=92e203aab60eee1d7f99d244a3576f6c6363fa2e
Submitter: Jenkins
Branch: master

commit 92e203aab60eee1d7f99d244a3576f6c6363fa2e
Author: Carlos Camacho <email address hidden>
Date: Tue Jan 10 10:02:14 2017 +0100

    Fix for AllNodesExtraConfig and fix environment files to create swap files/partitions

    This submission:

     - Fix an error in the AllNodesExtraConfig resource.
       (Can't merge servers multiple times).
     - Add environment files to deploy swap file/partition
       without manual edit over the templates.
     - If a swap partition is mounted without having it available
       the deployment will fail, the fix checks that if the
       partition is not created then the deployment continues.
     - Removing empty extra lines in swap templates.
     - Adjust description and remove unnecessary comments in
       swap templates.

    Closes-Bug: 1652184

    Change-Id: I828bbbbd4c178956aac74af49f80fcd4f62fa16b