Updated openstack/openstack
Project: openstack/nova  668c2c93a7b033c5907020682bb7f48b8eca1905

rename oslo.concurrency to oslo_concurrency

oslo.concurrency-0.3.0 has moved its path to oslo_concurrency,
the old path oslo.concurrency can still work but is deprecated now.

Change-Id: I1538dad5cbacf1e6041c571d5bc55994689c08b0
Closes-Bug: #1398656
Updated openstack/openstack
Project: openstack/cinder  122ea33c382bca726f7c3e34043c21f4ff51c038

Fixes intermittent NFS driver mount failure

During cinder volume driver initialization, NFS drivers often
fail to mount the NFS share backing their volumes, complaining
that the share in question is 'busy or already mounted'.

This commit introduces a retry loop around the ensure_mounted()
call inside set_nas_security_options() so that if there is contention
between volume process and backup process mounting the same share
the driver will not be stopped from loading.

Change-Id: I672433c1c31f420e5dcdbe565db3bb29af3abe7b
Closes-bug: 1395823