From 585e07875967364cc504a9dacb6a2cf19cc16e62 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Thu, 16 Jun 2016 17:42:56 +0300 Subject: [PATCH] Bump version to reflect current tag and fix tests Fix tests as firewalld is not available on test CentOS image Change-Id: If4f0aaf69e45c6c70a7723dcd36aefb081eb064f --- centos7/rpm/SPECS/openstack-neutron.spec | 6 ++++-- tests/runtests.sh | 7 ------- trusty/debian/changelog | 6 ++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index cab592417..b1f45767e 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -1,8 +1,8 @@ %global service neutron Name: openstack-%{service} -Version: 7.0.1 -Release: 1%{?dist}~mos8.0.1 +Version: 7.0.4 +Release: 2%{?dist}~mos8.0.1 Epoch: 1 Summary: OpenStack Networking Service @@ -879,6 +879,8 @@ fi %changelog +* Thu Jun 16 2016 Sergey Kolekonov 1:7.0.4-2%{?dist}~mos8.0.1 +- Bump version according to the latest tag * Fri Dec 18 2015 Sergey Kolekonov 1:7.0.1-1%{?dist}~mos8.0.1 - Bump version according to the latest tag * Tue Dec 15 2015 Jerzy Mikolajczak 1:7.0.0-1%{?dist}~mos8.0.1 diff --git a/tests/runtests.sh b/tests/runtests.sh index 372e4add2..ca80d6a9e 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -53,13 +53,6 @@ install_neutron_server () { } setup_rabbitmq () { - #Setup firewall on CentOS 7 - if ! $UBUNTU ; then - firewall-cmd --permanent --add-port=5672/tcp - firewall-cmd --reload - setsebool -P nis_enabled 1 - fi - restart_service rabbitmq-server if [ $? -ne 0 ]; then echo "RabbitMQ server failed to start" diff --git a/trusty/debian/changelog b/trusty/debian/changelog index a74808231..975a8609c 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +neutron (2:7.0.4-2~u14.04+mos1) mos8.0; urgency=medium + + * Bump version to reflect current tag + + -- Sergey Kolekonov Thu, 16 Jun 2016 17:42:39 +0300 + neutron (2:7.0.1-1~u14.04+mos1) mos8.0; urgency=medium * Fix version according to versioning policy -- 2.45.2