diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-20 13:18:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-20 13:18:22 +0000 |
| commit | 7fdabfb5a46a55d4d6007f855ce7ef89926a1051 (patch) | |
| tree | b9024483a8d4603af3664ac260fc64b914dc36c3 | |
| parent | 58bc90d143303c1f9d4e9f174294f71dfa8303d6 (diff) | |
| parent | 10ea62cc5d951aabdb0c5cd27c0f9cdbb53efb8f (diff) | |
Merge "Fix TenantNIC and PublicNIC config"
| -rw-r--r-- | ci/PR_revision.log | 3 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 15787b95..ad51846a 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -38,4 +38,5 @@ 76,Add networking-vpp ML2 mechanism driver 77,Update FDIO to use opendaylight_v2 mechanism driver 78,Fix spelling mistake in specs filter -79,Fix controller and compute ip array
\ No newline at end of file +79,Fix controller and compute ip array +80,Change TenantNIC and PublicNIC to be role specific
\ No newline at end of file diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 498fd135..c7301fdd 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -178,8 +178,20 @@ EOI # set NIC heat params and resource registry ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI -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 +if [ -n "${private_network_compute_interface}" ]; then + sudo sed -i '/ComputeTenantNIC:/c\ ComputeTenantNIC: '${private_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml +fi +if [ -n "${private_network_controller_interface}" ]; then + sudo sed -i '/ControllerTenantNIC:/c\ ControllerTenantNIC: '${private_network_controller_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml +fi +# TODO: PublicNIC is not used today, however, in the future, we'll bind public nic to DPDK as well for certain scenarios. At that time, +# we'll need to make sure public network is enabled. +if [ -n "${public_network_compute_interface}" ]; then + sudo sed -i '/ComputePublicNIC:/c\ ComputePublicNIC: '${public_network_compute_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml +fi +if [ -n "${public_network_controller_interface}" ]; then + sudo sed -i '/ControllerPublicNIC:/c\ ControllerPublicNIC: '${public_network_controller_interface} /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml +fi EOI DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml" |