fixed code based on test results
Initial Image mgmt Openstack commit