Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change virtual deployment VMs nic model to virtio for dpdk support
[apex.git]
/
build
/
overcloud-full.sh
diff --git
a/build/overcloud-full.sh
b/build/overcloud-full.sh
index
065201f
..
fe67c28
100755
(executable)
--- a/
build/overcloud-full.sh
+++ b/
build/overcloud-full.sh
@@
-10,6
+10,7
@@
set -e
source ./cache.sh
source ./variables.sh
set -e
source ./cache.sh
source ./variables.sh
+source ./functions.sh
populate_cache "$rdo_images_uri/overcloud-full.tar"
populate_cache "$rdo_images_uri/overcloud-full.tar"
@@
-21,12
+22,29
@@
mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
##### Prep initial overcloud image with common deps #####
##########################################################
##### Prep initial overcloud image with common deps #####
##########################################################
+# prep opnfv-puppet-tripleo for undercloud
+clone_fork opnfv-puppet-tripleo
+pushd opnfv-puppet-tripleo > /dev/null
+git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar.gz
+popd > /dev/null
+
pushd images > /dev/null
pushd images > /dev/null
-# remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV
+dpdk_pkg_str=''
+for package in ${dpdk_rpms[@]}; do
+ curl -O "$dpdk_uri_base/$package"
+ dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
+done
+
+# installing forked opnfv-puppet-tripleo
# enable connection tracking for protocal sctp
# enable connection tracking for protocal sctp
+# upload dpdk rpms but do not install
LIBGUESTFS_BACKEND=direct virt-customize \
LIBGUESTFS_BACKEND=direct virt-customize \
+ --upload ../opnfv-puppet-tripleo.tar.gz:/etc/puppet/modules \
+ --run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \
--run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
--run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
+ --run-command "mkdir /root/dpdk_rpms" \
+ $dpdk_pkg_str \
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2