X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fovercloud-full.sh;h=af978edbe9990e0bab5107395ee247049f0b8802;hb=2af53674aec6188abbc73b066c5942d4aea9e043;hp=5e11b778292087a06acebd1d14218e01e2954b63;hpb=81e8d7b55fbc27d8f25031817baf92d9b100f322;p=apex.git

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 5e11b778..af978edb 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -22,42 +22,20 @@ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
 ##########################################################
 
 pushd images > /dev/null
-# Update puppet-aodh it's old
-rm -rf aodh
-git clone https://github.com/openstack/puppet-aodh aodh
-pushd aodh > /dev/null
-git checkout stable/liberty
-popd > /dev/null
-tar -czf puppet-aodh.tar.gz aodh
-
-# grab latest puppet-neutron module
-rm -rf puppet-neutron
-git clone -b stable/liberty https://github.com/openstack/puppet-neutron.git
-pushd puppet-neutron
-git archive --format=tar.gz --prefix=neutron/ HEAD > ../puppet-neutron.tar.gz
-popd
 
+dpdk_pkg_str=''
+for package in ${dpdk_rpms[@]}; do
+  curl -O "$dpdk_uri_base/$package"
+  dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
+done
 
-# Add epel to install ceph
-# update aodh
-# puppet-neutron-force-metadata.patch
-# puppet-cinder-quota-fix
-#aodh-puppet-tripleo
-AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer"
-AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier"
+# remove openstack-neutron-openvswitch, ain't nobody need that in OPNFV
+# enable connection tracking for protocal sctp
+# upload dpdk rpms but do not install
 LIBGUESTFS_BACKEND=direct virt-customize \
-    --upload puppet-aodh.tar.gz:/etc/puppet/modules/ \
-    --run-command "cd /etc/puppet/modules/ && rm -rf aodh && tar xzf puppet-aodh.tar.gz" \
     --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
-    --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
-    --install "$AODH_PKG,ceph" \
-    --run-command "rm -rf /etc/puppet/modules/neutron" \
-    --upload puppet-neutron.tar.gz:/etc/puppet/modules/ \
-    --run-command "cd /etc/puppet/modules/ && tar xzf puppet-neutron.tar.gz" \
-    --upload ../puppet-cinder-quota-fix.patch:/tmp \
-    --run-command "cd /etc/puppet/modules/cinder && patch -Np1 < /tmp/puppet-cinder-quota-fix.patch" \
-    --upload ../aodh-puppet-tripleo.patch:/tmp \
-    --run-command "cd /etc/puppet/modules/tripleo && patch -Np1 < /tmp/aodh-puppet-tripleo.patch" \
+    --run-command "mkdir /root/dpdk_rpms" \
+    $dpdk_pkg_str \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2