This reverts commit f00a65ea.

Reason for revert: fix for kolla-ansible installation with
openstack.kolla has merged.

Change-Id: I361c68904eb66e9728b4a902a0998e4bc06d2dcd