diff options
| -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 |