summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-04-20 00:11:25 -0400
committerFeng Pan <fpan@redhat.com>2017-04-20 00:11:25 -0400
commita32ab67813d8e33c359a5205d221e71ca9409091 (patch)
treef1b10e10fe5ab33604dd57593bd0fb3715f8a419 /lib
parent8f132fde05517f2c662c9bc945d1712a03eb2a1b (diff)
Add ODL netvirt VPP support
opnfv-tht-pr: 131 Change-Id: I112d454078bd29a386b8557bf1d015d81f328d61 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh11
-rw-r--r--lib/python/apex/deploy_settings.py3
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index ea30ccb8..f2c9a857 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -34,7 +34,9 @@ function overcloud_deploy {
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/gluon.yaml"
fi
elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
- if [ "${deploy_options_array['sdn_l3']}" == "True" ]; then
+ if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-netvirt-vpp.yaml"
+ elif [ "${deploy_options_array['sdn_l3']}" == "True" ]; then
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
else
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml"
@@ -300,6 +302,13 @@ EOI
-a overcloud-full.qcow2
EOI
fi
+ if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \
+ --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \
+ -a overcloud-full.qcow2
+EOI
+ fi
fi
# check if ceph should be enabled
diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py
index dc58d764..48ce340d 100644
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -31,7 +31,8 @@ OPT_DEPLOY_SETTINGS = ['performance',
'ceph_device',
'yardstick',
'dovetail',
- 'odl_vpp_routing_node']
+ 'odl_vpp_routing_node',
+ 'odl_vpp_netvirt']
VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs']