diff options
author | Feng Pan <fpan@redhat.com> | 2016-09-15 00:12:33 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2016-09-16 01:30:50 +0000 |
commit | 24d6290c92773121596051086b3d6269fef61084 (patch) | |
tree | cd6292bd0fe701f2e5ea8d42a66862e6e86ce96b /lib/overcloud-deploy-functions.sh | |
parent | 6626849fa31c2d99292a52599ef69fdf6be8f7d0 (diff) |
Networking-vpp fixes
- Update TenantNIC and PublicNIC in numa.yaml
- Use OVS rather than linux bridge for virtual deployment on jump host
- Fix controller and compute IP arrays in T-H-T
- Move networking-vpp repo for vlan rewrite patch
JIRA: APEX-261
opnfv-tht-pr: 79
Change-Id: I4b3b6b09613e7c47869617e15aafec8e7b59d18f
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 37d2dc147574a6d5bdd5cae44e2ac02f8cac4d59)
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index e278a68e..498fd135 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -178,8 +178,8 @@ EOI # set NIC heat params and resource registry ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI -sed -i '/TenantNIC:/c\ TenantNIC: '${private_network_compute_interface} opnfv-environment.yaml -sed -i '/PublicNIC:/c\ PublicNIC: '${public_network_compute_interface} opnfv-environment.yaml +sudo sed -i '/TenantNIC:/c\ TenantNIC: '${private_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml +sudo sed -i '/PublicNIC:/c\ PublicNIC: '${public_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml EOI DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml" |