From 28cff8b08b5317d2ba2ac5ebb8d02b2f04b51654 Mon Sep 17 00:00:00 2001
From: Dmitry Pyzhov <dpyzhov@mirantis.com>
Date: Thu, 5 Mar 2015 04:08:41 +0300
Subject: [PATCH] Set version of Fuel to 6.1 everywhere

blueprint package-fuel-components

Change-Id: I728b06cae0abb6a4a491641545b0cf8ee19bfd01
---
 fuel_agent/setup.cfg                    |  2 +-
 fuel_agent_ci/setup.cfg                 |  2 +-
 fuelmenu/setup.py                       |  2 +-
 nailgun/nailgun/fixtures/openstack.yaml |  4 ++--
 nailgun/setup.py                        |  2 +-
 network_checker/setup.py                |  2 +-
 shotgun/setup.py                        |  2 +-
 specs/nailgun.spec                      | 12 ++++--------
 tasklib/setup.py                        |  2 +-
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/fuel_agent/setup.cfg b/fuel_agent/setup.cfg
index 589bfb5ad7..1bbbbba2ce 100644
--- a/fuel_agent/setup.cfg
+++ b/fuel_agent/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = fuel-agent
-version = 6.0.0
+version = 6.1.0
 author = Mirantis
 author-email = fuel-dev@lists.launchpad.net
 summary = Fuel agent
diff --git a/fuel_agent_ci/setup.cfg b/fuel_agent_ci/setup.cfg
index 36eb386b61..8367061f02 100644
--- a/fuel_agent_ci/setup.cfg
+++ b/fuel_agent_ci/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = fuel-agent-ci
-version = 6.0.0
+version = 6.1.0
 author = Mirantis
 author-email = fuel-dev@lists.launchpad.net
 summary = Fuel agent
diff --git a/fuelmenu/setup.py b/fuelmenu/setup.py
index d67712f43c..741183bbe5 100644
--- a/fuelmenu/setup.py
+++ b/fuelmenu/setup.py
@@ -18,7 +18,7 @@ import setuptools
 
 setuptools.setup(
     name="fuelmenu",
-    version='6.0.0',
+    version='6.1.0',
     description="Console util for pre-configuration of Fuel server",
     author="Matthew Mosesohn",
     author_email="mmosesohn@mirantis.com",
diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml
index f3fefd2a53..db1e195845 100644
--- a/nailgun/nailgun/fixtures/openstack.yaml
+++ b/nailgun/nailgun/fixtures/openstack.yaml
@@ -1199,7 +1199,7 @@
   extend: *base_release
   fields:
     name: "Juno on CentOS 6.5"
-    version: "2014.2-6.1"
+    version: "2014.2.2-6.1"
     can_update_from_versions: []
     operating_system: "CentOS"
     description: "This option will install the OpenStack Juno packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
@@ -1260,7 +1260,7 @@
   extend: *base_release
   fields:
     name: "Juno on Ubuntu 14.04.1"
-    version: "2014.2-6.1"
+    version: "2014.2.2-6.1"
     can_update_from_versions: []
     operating_system: "Ubuntu"
     description: "This option will install the OpenStack Juno packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
diff --git a/nailgun/setup.py b/nailgun/setup.py
index 11b42577c3..526d0b9bf6 100644
--- a/nailgun/setup.py
+++ b/nailgun/setup.py
@@ -19,7 +19,7 @@ from setuptools import find_packages
 from setuptools import setup
 
 name = 'nailgun'
-version = '6.0.0'
+version = '6.1.0'
 
 
 def find_requires():
diff --git a/network_checker/setup.py b/network_checker/setup.py
index 7ddfece604..79835b5f83 100644
--- a/network_checker/setup.py
+++ b/network_checker/setup.py
@@ -17,7 +17,7 @@ import setuptools
 
 setuptools.setup(
     name="nailgun-net-check",
-    version='6.0.0',
+    version='6.1.0',
     author="Mirantis Inc",
     classifiers=[
         "License :: OSI Approved :: Apache 2.0",
diff --git a/shotgun/setup.py b/shotgun/setup.py
index 247cfbc308..38129d2b90 100644
--- a/shotgun/setup.py
+++ b/shotgun/setup.py
@@ -17,7 +17,7 @@ import setuptools
 
 setuptools.setup(
     name='shotgun',
-    version='6.0.0',
+    version='6.1.0',
     description='Shotgun package',
     long_description='Shotgun is diagnostic snapshot generator',
     classifiers=[
diff --git a/specs/nailgun.spec b/specs/nailgun.spec
index 50858761aa..3c05bffdc3 100644
--- a/specs/nailgun.spec
+++ b/specs/nailgun.spec
@@ -1,11 +1,7 @@
 %define name nailgun
-%define version 6.0.0
+%define version 6.1.0
 %define release 1
 
-#FIXME(aglarendil): actually, we should have one version
-#everywhere, but we will fix it a little bit later
-%define new_version 6.1.0
-
 Summary: Nailgun package
 Name: %{name}
 Version: %{version}
@@ -115,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 %package -n nailgun-agent
 
 Summary:   Nailgun startup agent
-Version:   6.0.0
+Version:   %{version}
 Release:   1
 License:   GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}
@@ -274,7 +270,7 @@ Fuel-agent package
 
 %package -n fencing-agent
 Summary:   Fencing agent
-Version:   6.0.0
+Version:   %{version}
 Release:   1
 License:   GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}
@@ -312,7 +308,7 @@ Command line utility to download apt/yum repositories for Fuel
 %package -n fuel-provisioning-scripts
 
 Summary: Fuel provisioning scripts
-Version: %{new_version}
+Version: %{version}
 Release: %{release}
 URL:     http://mirantis.com
 License: Apache
diff --git a/tasklib/setup.py b/tasklib/setup.py
index fa240a0505..9bb473163d 100644
--- a/tasklib/setup.py
+++ b/tasklib/setup.py
@@ -25,7 +25,7 @@ def requirements():
 
 
 name = 'tasklib'
-version = '6.0.0'
+version = '6.1.0'
 
 
 setuptools.setup(