Align with openstack requirements

Change-Id: I8f9b2743d507c39034ae4b2208731f0515c6e106