diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-02-09 09:21:55 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-02-10 13:43:14 -0500 |
| commit | c30626e49098fbb3b02fc98e59d52af4fcc1cab8 (patch) | |
| tree | 86efcd79967a8fd0178600bf53362f21e18692cb /build | |
| parent | 78790f972ccd2b84b5ad037549fa0c68f694eae2 (diff) | |
Fixes networking-bgpvpn pkg install
Also includes minor change for tox working directory to move up one dir
(build dir) for congress. This is due to https://github.com/tox-dev/tox/issues/66
Removes networking_bgpvpn.conf, and uses neutron service_providers to
set. This is because we do not have upstream patches to configure
bgpvpn conf file via OOO and having 2 definitions breaks deploy.
Change-Id: I9846bd959c1ed8e2e81f3ae30470ec357da3fc8f
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 4 | ||||
| -rw-r--r-- | build/rpm_specs/openstack-congress.spec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 94417d1c..f64e514c 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -81,7 +81,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall python2-networking-bgpvpn && rm -rf /root/networking-bgpvpn*" \ + --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall -y *.rpm && rm -rf /root/networking-bgpvpn*" \ + --run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \ + --run-command "touch /etc/neutron/networking_bgpvpn.conf" \ -a overcloud-full-opendaylight_build.qcow2 mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 diff --git a/build/rpm_specs/openstack-congress.spec b/build/rpm_specs/openstack-congress.spec index 37023be8..f08cd0d0 100644 --- a/build/rpm_specs/openstack-congress.spec +++ b/build/rpm_specs/openstack-congress.spec @@ -37,7 +37,7 @@ install -d -m 755 %{buildroot}/etc/congress/snapshot/ install etc/api-paste.ini %{buildroot}/etc/congress/api-paste.ini install etc/policy.json %{buildroot}/etc/congress/policy.json -tox -egenconfig +tox -e genconfig --workdir ../.tox install etc/congress.conf.sample %{buildroot}/etc/congress/congress.conf install -p -D -m 644 openstack-congress.service %{buildroot}%{_unitdir}/openstack-congress.service |