diff options
author | 2016-06-14 12:53:42 +0000 | |
---|---|---|
committer | 2016-06-14 12:53:42 +0000 | |
commit | 0a85539980ec943f3e590dd279d1a129fb7966c3 (patch) | |
tree | 69b2d86536ded4c88cf723194276b4d8869dcabc /build/overcloud-full.sh | |
parent | 2af53674aec6188abbc73b066c5942d4aea9e043 (diff) | |
parent | af2f93cebc62cd0d6f7c4b1a74fdeb65fbcf90a8 (diff) |
Merge "puppet-tripleo fork integration"
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-x | build/overcloud-full.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index af978edb..fe67c287 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -10,6 +10,7 @@ set -e source ./cache.sh source ./variables.sh +source ./functions.sh populate_cache "$rdo_images_uri/overcloud-full.tar" @@ -21,6 +22,12 @@ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2 ##### 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 dpdk_pkg_str='' @@ -29,10 +36,12 @@ for package in ${dpdk_rpms[@]}; do dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms" done -# remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV +# installing forked opnfv-puppet-tripleo # enable connection tracking for protocal sctp # upload dpdk rpms but do not install 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 "mkdir /root/dpdk_rpms" \ $dpdk_pkg_str \ |