diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-03-11 09:26:47 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-03-14 18:10:08 -0400 |
| commit | 23ec533e42d18b8d05efdd1060e892ed145023a9 (patch) | |
| tree | 6f8d7abc2186cbaf2be5d32ba995f9ac3feb529a | |
| parent | 640a338b812b5ae2636b21cbd5956b9d0d727a49 (diff) | |
ODL L3 and NOSDN fixes
- taking the IP address off of br-ex in ODL L3 deployments
- leaving neutron agent installed for nosdn
These changes are on master but master has diverged from
stable/brahmaputra so they need to be committed directly
to stable/brahmaputra
JIRA: APEX-110, APEX-112
Change-Id: I8dd2a5ef4041200b13e6918d002b242cf04fc2cc
Signed-off-by: Dan Radez <dradez@redhat.com>
| -rwxr-xr-x | build/instack.sh | 3 | ||||
| -rwxr-xr-x | ci/deploy.sh | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/build/instack.sh b/build/instack.sh index 8c92a059..682d1b26 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -252,13 +252,12 @@ git checkout stable/liberty popd tar -czf puppet-aodh.tar.gz aodh -# Add epel, aodh and ceph, remove openstack-neutron-openvswitch +# Add epel, aodh and ceph AODH_PKG="openstack-aodh-api,openstack-aodh-common,openstack-aodh-compat,openstack-aodh-evaluator,openstack-aodh-expirer" AODH_PKG+=",openstack-aodh-listener,openstack-aodh-notifier" LIBGUESTFS_BACKEND=direct virt-customize \ --upload puppet-aodh.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && rm -rf aodh && tar xzf puppet-aodh.tar.gz" \ - --run-command "yum remove -y openstack-neutron-openvswitch" \ --run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \ --run-command "if ! rpm -q epel-release > /dev/null; then yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; fi" \ --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \ diff --git a/ci/deploy.sh b/ci/deploy.sh index 31cd4625..01d83712 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -663,13 +663,9 @@ function configure_network_environment { sed -i 's#^.*Controller::Net::SoftwareConfig:.*$# OS::TripleO::Controller::Net::SoftwareConfig: nics/controller'${nic_ext}'.yaml#' $1 - # check for ODL L3 + # check for L3 Distributed Routing if [ "${deploy_options_array['sdn_l3']}" == 'true' ]; then - nic_ext+=_br-ex - fi - - if [ "${deploy_options_array['sdn_controller']}" == 'onos' ]; then - nic_ext+=_no-public-ip + nic_ext+=_br-ex_no-public-ip fi # set nics appropriately |