diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-01-19 14:38:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-19 14:38:20 +0000 |
| commit | 4c292aa28b8bb4406d829eaa931d2801c9c5e61b (patch) | |
| tree | a59e2269391e220b17b0940a036a0964f5db319a /ci | |
| parent | bd2faa0275917ef18606f781f462d33387d2532a (diff) | |
| parent | f7a3eb8dc430d017ad99e9ae014796908fb3be9a (diff) | |
Merge "Fixes ODL L3 so that it now deploys correctly"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index e99f4b27..1ce4e186 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -651,6 +651,8 @@ function configure_network_environment { sed -i 's#^.*Compute::Ports::StoragePort:.*$# OS::TripleO::Compute::Ports::StoragePort: '${tht_dir}'/ports/noop.yaml#' $1 fi + sed -i 's#^.*Controller::Net::SoftwareConfig:.*$# OS::TripleO::Controller::Net::SoftwareConfig: nics/controller'${nic_ext}'.yaml#' $1 + # check for ODL L3 if [ ${deploy_options_array['sdn_l3']} == 'true' ]; then nic_ext+=_br-ex @@ -658,7 +660,7 @@ function configure_network_environment { # set nics appropriately sed -i 's#^.*Compute::Net::SoftwareConfig:.*$# OS::TripleO::Compute::Net::SoftwareConfig: nics/compute'${nic_ext}'.yaml#' $1 - sed -i 's#^.*Controller::Net::SoftwareConfig:.*$# OS::TripleO::Controller::Net::SoftwareConfig: nics/controller'${nic_ext}'.yaml#' $1 + } ##Copy over the glance images and instack json file ##params: none |