CFY 1124 openstack plugin atomicity and cleanup