Populate extra_hosts with all available in pillar hosts records by default

Since there are fqdn records in Openstack service catalog, we need to
resolve these names to ips inside our containers. From my POV would be good
to populate all containers with this mapping, make it by default for
every service in compose.

Also align indents and small refactoring.

This reverts commit 24ff96d08acbbd58bcf408dc8561aea97ad0f3f1.

Related-PROD: PROD-26540 (PROD:26540)

Change-Id: I427381a64d1d5b1685f94ac8d38d2d4df0c5d1ba
1 file changed