This partially reverts 611cd1fa9c4b9d70e339ff1290f680f2ff6a5878 ,
because the change requires openstackclient > 7.0.0 but now it was
downgraded in u-c to unblock nova. We can revert this change again
when openstackclient in u-c is again bumped.
Change-Id: I05b7d0fd257852c44ce8f720277a84896a345a27
4e92f2f130