diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-10 03:01:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-10 03:01:14 +0000 |
| commit | 6a07c774db6e94e34d3aea4fbcc2bee75633fe6b (patch) | |
| tree | 921bb401f8b5044d70f77e61a0a84844880a0979 /build/overcloud-full.sh | |
| parent | a715ec7cd3677b22c6961342491d61637a487586 (diff) | |
| parent | d327766d7e7ff91f4ed1a11cfcda70254420f524 (diff) | |
Merge "Enables networking-vpp in nosdn-fdio scenario"
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 3 |
1 files changed, 3 insertions, 0 deletions
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 |