diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-01 16:46:58 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-05-01 16:46:58 -0400 |
| commit | 4a08bfe63a3fedbd1d15119ea979080e9cdc58b8 (patch) | |
| tree | f869f9dc48f60439481757f7d11fe9d871678e68 | |
| parent | 22bc385f5b2e25694699a614268aaad2fdacbb12 (diff) | |
Removes OC condition in dhcp-all-interfaces
Due to this condition, a non-first ctlplane NIC may fail to come up in
deployments, causing deployment to fail. This is a temporary workaround
until the proper fix can be merged:
https://review.openstack.org/#/c/561003/1
JIRA: APEX-588
Change-Id: I3f19afba2618161843ce3b76a03e2dcf1fcb4b99
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | apex/overcloud/deploy.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 03e56529..90c5cd4b 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -434,6 +434,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 |