The modified puppet code style

Change-Id: I1031e9f1b5586cc0c26b0f85a31fe6ce5e6c168c
Closes-Bug: #1338226
Merge "The modified puppet code style"