Bump version to reflect current tag and fix tests

Fix tests as firewalld is not available on test CentOS image

Change-Id: If4f0aaf69e45c6c70a7723dcd36aefb081eb064f

diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec
index cab5924173f13f001ac0165f0828cb0ff9563422..b1f45767e56715081c5d63dae2b921a75ffe368c 100644 (file)
--- 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 <skolekonov@mirantis.com> 1:7.0.4-2%{?dist}~mos8.0.1
+- Bump version according to the latest tag
 * Fri Dec 18 2015 Sergey Kolekonov <skolekonov@mirantis.com> 1:7.0.1-1%{?dist}~mos8.0.1
 - Bump version according to the latest tag
 * Tue Dec 15 2015 Jerzy Mikolajczak <jmikolajczak@mirantis.com> 1:7.0.0-1%{?dist}~mos8.0.1

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 372e4add2e67067bdafe23189b2035acc5b33a15..ca80d6a9e7d95863038918dce7c068bdadabe5da 100755 (executable)
--- 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 a74808231cca8a2590cc6020d87d036f388b0267..975a8609ccd6200101ea3054717ae1707375a776 100644 (file)
--- 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 <skolekonov@mirantis.com>  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