Merge "OpenStack deployment using kolla"