diff options
| author |   Ricardo Noriega <rnoriega@redhat.com> | 2018-08-07 18:29:54 +0200 |
|---|---|---|
| committer | Ricardo Noriega <rnoriega@redhat.com> | 2018-08-22 17:48:28 +0200 |
| commit | 14de5d725e74cb885a48146217e2fc9d8f093df6 (patch) | |
| tree | bc189f9ce4c5bb2d8d21d48b174a54da21df8bbd /apex/builders/overcloud_builder.py | |
| parent | c0a4aa96bbe70eefb179d59a1267b8115651bba5 (diff) | |
Enable SFC scenarios for Gambia
- This patch will install OVS 2.9.2 including
its kernel module which allows native NSH
headers.
- Fix Custom OVS due to bug:
https://bugzilla.redhat.com/show_bug.cgi?id=1544892
- Tacker is disable for the time being, tacker-conductor
needs to be enabled.
JIRA: APEX-630
Change-Id: Ia410309fd7053602ce78eae919839d0f57c9742a
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'apex/builders/overcloud_builder.py')
| -rw-r--r-- | apex/builders/overcloud_builder.py | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/apex/builders/overcloud_builder.py b/apex/builders/overcloud_builder.py index b8556456..a74ec252 100644 --- a/apex/builders/overcloud_builder.py +++ b/apex/builders/overcloud_builder.py @@ -87,6 +87,43 @@ def inject_quagga(image, tmp_dir): logging.info("Quagga injected into {}".format(image)) +def inject_ovs_nsh(image, tmp_dir): + """ + Downloads OpenVswitch, compiles it and installs it on the + overcloud image on the fly. + :param image: + :param tmp_dir: + :return: + """ + ovs_filename = os.path.basename(con.OVS_URL) + ovs_folder = ovs_filename.replace(".tar.gz", "") + utils.fetch_upstream_and_unpack(tmp_dir, + os.path.split(con.OVS_URL)[0] + "/", + [ovs_filename]) + (ovs_dist_name, ovs_version) = ovs_folder.split("-") + + virt_ops = [ + {con.VIRT_UPLOAD: "{}:/root/".format(tmp_dir + "/" + ovs_filename)}, + {con.VIRT_INSTALL: "rpm-build,autoconf,automake,libtool,openssl," + "openssl-devel,python,python-twisted-core,python-six,groff,graphviz," + "python-zope-interface,desktop-file-utils,procps-ng,PyQt4," + "libcap-ng,libcap-ng-devel,selinux-policy-devel,kernel-devel," + "kernel-headers,kernel-tools,rpmdevtools,systemd-units,python-devel," + "python-sphinx"}, + {con.VIRT_RUN_CMD: "cd /root/ && tar xzf {}".format(ovs_filename)}, + {con.VIRT_UPLOAD: + "{}/build_ovs_nsh.sh:/root/{}".format(tmp_dir, ovs_folder)}, + {con.VIRT_RUN_CMD: + "cd /root/{0} && chmod -R 777 * && chown -R root:root * && " + "./build_ovs_nsh.sh && rpm -Uhv --force rpm/rpmbuild/RPMS/x86_64/{0}" + "-1.el7.x86_64.rpm && rpm -Uhv --force rpm/rpmbuild/RPMS/x86_64" + "/openvswitch-kmod-{1}-1.el7.x86_64.rpm".format(ovs_folder, + ovs_version)} + ] + virt_utils.virt_customize(virt_ops, image) + logging.info("OVS injected into {}".format(image)) + + def build_dockerfile(service, tmp_dir, docker_cmds, src_image_uri): """ Builds docker file per service and stores it in a |