From d327766d7e7ff91f4ed1a11cfcda70254420f524 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Wed, 7 Sep 2016 22:26:35 -0400 Subject: Enables networking-vpp in nosdn-fdio scenario - Add puppet neutron support for configuring both ML2 driver and networking-vpp agent - Update THT to invoke new puppet classes. JIRA: APEX-261 opnfv-tht-pr: 76 Change-Id: Iab21713eb711e9f24fa66cba30c895e43a3e945e Signed-off-by: Feng Pan --- build/overcloud-full.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 0357ba05..21667070 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -115,6 +115,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ $dpdk_pkg_str \ $fdio_pkg_str \ --upload ../networking-vpp.noarch.rpm:/root/fdio \ + --run-command "pip install distro flask_restful" \ --run-command "yum install -y etcd" \ --run-command "pip install python-etcd" \ --install "centos-release-qemu-ev" \ @@ -149,6 +150,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "mkdir /root/fdio_neutron_l3" \ --upload ../neutron/agent/l3/namespaces.py:/root/fdio_neutron_l3/ \ --upload ../neutron/agent/l3/router_info.py:/root/fdio_neutron_l3/ \ + --upload ../puppet-neutron/manifests/agents/ml2/networking-vpp.pp:/etc/puppet/modules/neutron/manifests/agents/ml2/ \ + --upload ../puppet-neutron/manifests/plugins/ml2/networking-vpp.pp:/etc/puppet/modules/neutron/manifests/plugins/ml2/ \ -a overcloud-full_build.qcow2 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 -- cgit 1.2.3-korg