diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-19 00:20:34 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-01-19 00:20:34 -0500 |
| commit | f7a3eb8dc430d017ad99e9ae014796908fb3be9a (patch) | |
| tree | ee09ecf43bba8bcd2b4d2b8f426eb444c7f5d541 /ci | |
| parent | 668e52b657e134d27dbd03b473dc927daa58dda6 (diff) | |
Fixes ODL L3 so that it now deploys correctly
Fixes:
- opendaylight was not being installed on controllers due to missing
param
- controller nics were not being found due to using computes extension
of br-ex for ODL L3 (controllers have br-ex by default)
Change-Id: Ic1b6d57fe162194030607856120a742dbed1e9e2
Signed-off-by: Tim Rozet <trozet@redhat.com>
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 |