
This reverts commit b87634ca57febdcf8c930ecb5bb8adfb92358001. The above commit contains overlapping of variables, we need to keep puppet modules as general as possible and add the customisations at the template level. Closes-Bug: #1804254 Change-Id: I0e87eb9a086dcf187e2b77f8a129a63f2e6ddd6e