Disable batch upgrade deployments for disabled roles
Disable batch upgrade deployments for disabled roles

Currently we don't correctly disable the batch_upgrade_tasks, so
rework the loops to ensure we only create the batch deployments
for roles which enabled upgrades.

Note this modifies some loop whitespace too which cleans up the
rendered output and makes it a bit more readable/compact.

Change-Id: I1c257dcc351e99efa54f9cae4b3009287908756e
Partially-Renders: blueprint overcloud-upgrades-per-service

dprince/tripleo-heat-templates,openstack/tripleo-heat-templates,openstack/tripleo-heat-templates,dprince/tripleo-heat-templates