diff options
| author |   Tim Rozet <trozet@redhat.com> | 2019-03-20 12:08:49 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2019-03-20 12:19:56 -0400 |
| commit | e4b1cd108f74e2cd76caf6736632d597f7436a4e (patch) | |
| tree | 6210cbcff83bda6d183a793de7299a34c0c7d47d /apex/overcloud/deploy.py | |
| parent | 7aac412d1bff29f1571cee6c38f1184ad127d1df (diff) | |
Fixes deployment on CentOS 7.6
Ceph-ansible install is moved from image builder to post undercloud
install to ensure the right repo exists and it used. OVS building is now
skipped as the build fails with CentOS 7.6.
JIRA: APEX-658
Change-Id: I6ec253d5a88eb3cdfa38cf177b6e4b16ac5a16ed
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/overcloud/deploy.py')
| -rw-r--r-- | apex/overcloud/deploy.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 27263740..538f50a4 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -367,11 +367,12 @@ def prep_image(ds, ns, img, tmp_dir, root_pw=None, docker_tag=None, pw_op = "password:{}".format(root_pw) virt_cmds.append({con.VIRT_PW: pw_op}) - if dataplane == 'ovs': + # FIXME(trozet) ovs build is failing in CentOS 7.6 + # if dataplane == 'ovs': # FIXME(trozet) remove this after RDO is updated with fix for # https://bugzilla.redhat.com/show_bug.cgi?id=1544892 # https://review.rdoproject.org/r/#/c/13839/ - oc_builder.inject_ovs_nsh(tmp_oc_image, tmp_dir) + # oc_builder.inject_ovs_nsh(tmp_oc_image, tmp_dir) if dataplane == 'fdio': # Patch neutron with using OVS external interface for router |