Sync puppet-keystone

220c6996b0fb394138f77ec95c37c540f2e9a6ba 3.1.1

partially implements blueprint deploy-icehouse

Change-Id: Id315262c7cc735bfdce41b2f5a20117bfd2b3a04
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>