summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-12 16:37:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-12 16:37:35 +0000
commit8cc6ede48761ddd3bf9f9431da6de788454dd8b7 (patch)
tree4983e5e1f0b5fb4736602315749836eedbe8440a /apex
parenta3fd284d7253b8e09fa87bf98bcaae7d1e42ea3f (diff)
parent4a08bfe63a3fedbd1d15119ea979080e9cdc58b8 (diff)
Merge "Removes OC condition in dhcp-all-interfaces"
Diffstat (limited to 'apex')
-rw-r--r--apex/overcloud/deploy.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 2f33183..c7a8e40 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -405,6 +405,11 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None,
{con.VIRT_RUN_CMD: 'systemctl daemon-reload'},
{con.VIRT_RUN_CMD: 'systemctl enable losetup.service'},
])
+ # TODO(trozet) remove this after LP#173474 is fixed
+ dhcp_unit = '/usr/lib/systemd/system/dhcp-interface@.service'
+ virt_cmds.append(
+ {con.VIRT_RUN_CMD: "crudini --del {} Unit "
+ "ConditionPathExists".format(dhcp_unit)})
virt_utils.virt_customize(virt_cmds, tmp_oc_image)
logging.info("Overcloud image customization complete")
return patched_containers