summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-07-26 11:17:37 +0200
committerTim Rozet <trozet@redhat.com>2018-07-26 22:06:17 +0000
commit7c17ef653f9c867cdcb969c40f5a1eb4251bad74 (patch)
tree34438ecf96083fc11d9ac0b6511163b38c5d508c
parent6f7a9a9441e6ce5b689a0c5705804d8eea0e002a (diff)
Increasing loop device size for baremetal deployments
Change-Id: Ib3779733ac27183def6a59f3404cfbe9a3e9a211 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
-rw-r--r--apex/deploy.py2
-rw-r--r--apex/overcloud/deploy.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/apex/deploy.py b/apex/deploy.py
index 1168292e..65f00e04 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -418,6 +418,8 @@ def main():
opnfv_env = os.path.join(args.deploy_dir, args.env_file)
oc_deploy.prep_env(deploy_settings, net_settings, inventory,
opnfv_env, net_env_target, APEX_TEMP_DIR)
+ if not args.virtual:
+ oc_deploy.LOOP_DEVICE_SIZE = "50G"
patched_containers = oc_deploy.prep_image(
deploy_settings, net_settings, sdn_image, APEX_TEMP_DIR,
root_pw=root_pw, docker_tag=tag, patches=patches['overcloud'])
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 439848f8..dc7d84f0 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -75,6 +75,8 @@ OVS_NSH_RPM = "openvswitch-2.6.1-1.el7.centos.x86_64.rpm"
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
@@ -406,7 +408,8 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
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'},
])