dir rerange and add puppet
Merge branches 'master' and 'master' of https://github.com/lielongxingkong/openstack_logs