Merge "Add Openstack input"