Update part of cookbooks from OpenDeployment

Change-Id: I884d2157241150a5b1ec4e44f979908762467671