bugfix
Merge branch 'master' of https://github.com/qinjx/puppet-example
Merge branch 'master' of https://github.com/qinjx/puppet-example
remove conf_tpl