diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-07 22:17:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-07 22:17:08 +0000 |
| commit | bb70ea5659708fe6f81b6b6f28674dec4d6d45f1 (patch) | |
| tree | 511b4a9b2c275cde9efbd3b19e665208304d377e /lib | |
| parent | 6a83d0b2757894f96b26f2490326979862d9f704 (diff) | |
| parent | e984522f55bc1e024b4f5225903a1592219e1f86 (diff) | |
Merge "Modifies L3 Agent for FDIO Deployments" into stable/colorado
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 1127f049..30fd5e66 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -97,6 +97,9 @@ EOF if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then sudo sed -i '/FdioEnabled:/c\ FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml + LIBGUESTFS_BACKEND=direct virt-customize --run-command "cp -f /root/fdio_neutron_l3/namespaces.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \ + --run-command "cp -f /root/fdio_neutron_l3/router_info.py /usr/lib/python2.7/site-packages/neutron/agent/l3/" \ + -a overcloud-full.qcow2 if [ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]; then LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /root/ && tar zxvf networking-odl.tar.gz" \ --run-command "cd /root/networking-odl && git init && pip install -r requirements.txt" \ |