Merge "Increasing loop device size for baremetal deployments"

diff --combined apex/overcloud/deploy.py
index 2f58e8a,dc7d84f..716c57c
--- 1/apex/overcloud/deploy.py
--- 2/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@@ -75,6 -75,8 +75,8 @@@ OVS_NSH_RPM = "openvswitch-2.6.1-1.el7.
  ODL_NETVIRT_VPP_RPM = "/root/opendaylight-7.0.0-0.1.20170531snap665.el7" \
                        ".noarch.rpm"
  
+ LOOP_DEVICE_SIZE = "10G"
+ 
  LOSETUP_SERVICE = """[Unit]
  Description=Setup loop devices
  Before=network.target
@@@ -344,30 -346,15 +346,30 @@@ def prep_image(ds, ns, img, tmp_dir, ro
      if root_pw:
          pw_op = "password:{}".format(root_pw)
          virt_cmds.append({con.VIRT_PW: pw_op})
 -    if ds_opts['sfc'] and dataplane == 'ovs':
 -        virt_cmds.extend([
 -            {con.VIRT_RUN_CMD: "yum -y install "
 -                               "/root/ovs/rpm/rpmbuild/RPMS/x86_64/"
 -                               "{}".format(OVS_NSH_KMOD_RPM)},
 -            {con.VIRT_RUN_CMD: "yum downgrade -y "
 -                               "/root/ovs/rpm/rpmbuild/RPMS/x86_64/"
 -                               "{}".format(OVS_NSH_RPM)}
 -        ])
 +
 +    if dataplane == 'ovs':
 +        if ds_opts['sfc']:
 +            virt_cmds.extend([
 +                {con.VIRT_RUN_CMD: "yum -y install "
 +                                   "/root/ovs/rpm/rpmbuild/RPMS/x86_64/"
 +                                   "{}".format(OVS_NSH_KMOD_RPM)},
 +                {con.VIRT_RUN_CMD: "yum downgrade -y "
 +                                   "/root/ovs/rpm/rpmbuild/RPMS/x86_64/"
 +                                   "{}".format(OVS_NSH_RPM)}
 +            ])
 +        elif sdn == 'opendaylight':
 +            # FIXME(trozet) remove this after RDO is updated with fix for
 +            # https://bugzilla.redhat.com/show_bug.cgi?id=1544892
 +            ovs_file = os.path.basename(con.CUSTOM_OVS)
 +            ovs_url = con.CUSTOM_OVS.replace(ovs_file, '')
 +            utils.fetch_upstream_and_unpack(dest=tmp_dir, url=ovs_url,
 +                                            targets=[ovs_file])
 +            virt_cmds.extend([
 +                {con.VIRT_UPLOAD: "{}:/root/".format(os.path.join(tmp_dir,
 +                                                                  ovs_file))},
 +                {con.VIRT_RUN_CMD: "yum downgrade -y /root/{}".format(
 +                    ovs_file)}
 +            ])
      if dataplane == 'fdio':
          # Patch neutron with using OVS external interface for router
          # and add generic linux NS interface driver
@@@ -421,7 -408,8 +423,8 @@@
          virt_cmds.extend([
              {con.VIRT_UPLOAD: "{}:/usr/lib/systemd/system/".format(tmp_losetup)
               },
-             {con.VIRT_RUN_CMD: 'truncate /srv/data.img --size 10G'},
+             {con.VIRT_RUN_CMD: 'truncate /srv/data.img --size {}'
+                 .format(LOOP_DEVICE_SIZE)},
              {con.VIRT_RUN_CMD: 'systemctl daemon-reload'},
              {con.VIRT_RUN_CMD: 'systemctl enable losetup.service'},
          ])