summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-09-07 22:17:07 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-07 22:17:08 +0000
commitbb70ea5659708fe6f81b6b6f28674dec4d6d45f1 (patch)
tree511b4a9b2c275cde9efbd3b19e665208304d377e /lib
parent6a83d0b2757894f96b26f2490326979862d9f704 (diff)
parente984522f55bc1e024b4f5225903a1592219e1f86 (diff)
Merge "Modifies L3 Agent for FDIO Deployments" into stable/colorado
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh3
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" \
href='#n191'>191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362