diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-02-15 18:49:00 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-03-01 09:43:30 -0500 |
| commit | f28880f75359edb99f3e4e6b2680fdb814774903 (patch) | |
| tree | 88ddbd129436c689189341814720af57c18e2c64 /build/instack.sh | |
| parent | bc0733cb7611c8175463b048ba3139c3d634bfb1 (diff) | |
Adding SDNVPN support
Change-Id: Id2d6d46a53129d4ae2f93fad835536da067e42df
JIRA: APEX-51
Signed-off-by: Dan Radez <dradez@redhat.com>
(cherry picked from commit c86bd1f24647646b7489cd72e0a0bb91f4a505f1)
Diffstat (limited to 'build/instack.sh')
| -rwxr-xr-x | build/instack.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/instack.sh b/build/instack.sh index 24f6f1f5..8c92a059 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -260,7 +260,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --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" \ - --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ + --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 \ --install "$AODH_PKG,ceph" \ -a overcloud-full-opendaylight.qcow2 |