Merge pull request #106 from open-cloud/reconcile_openstack

Reconcile openstack