Assign Swift network roles to the same endpoint

There is an additional MOS service 'swiftcheck' which
is set up on controllers only if 'swift/api' and
'swift/replication' roles are assigned to the same L3
network. Modified network template in order to cover
such deployment case by automatic tests.

Change-Id: I5f659d947212ca6bcf8c19580fe85dd279035f36
Related-bug: #1548275

fuelweb_test/network_templates/default_no_mgmt_nwk.yaml

@@ -43,6 +43,7 @@ adv_net_template:
           - br-storage
         roles:
           cinder/iscsi: br-storage
+          swift/api: br-storage
           swift/replication: br-storage
           ceph/replication: br-storage
           storage: br-storage
@@ -106,7 +107,6 @@ adv_net_template:
           keystone/api: br-fw-admin
           neutron/api: br-fw-admin
           neutron/mesh: br-fw-admin
-          swift/api: br-fw-admin
           sahara/api: br-fw-admin
           ceilometer/api: br-fw-admin
           cinder/api: br-fw-admin