openstack
/
fuel-web
Code Issues Proposed changes

Merge "Bump version to 7.0"

This commit is contained in:
Jenkins 2015-06-10 16:14:16 +00:00 committed by Gerrit Code Review
parent 2ff95c0c5f 0e8f267720
commit b284de9a89
14 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,8 +1,14 @@
nailgun (7.0.0-1) trusty; urgency=low
* Update version to 7.0.0
-- Aleksandra Fedorova <afedorova@mirantis.com> Mon, 08 Jun 2015 18:15:00 +0300
nailgun (6.1.0-1) trusty; urgency=low
* Update version to 6.1.0
-- Matthew Mosesohn <mmosesohn@miirantis.com> Wed, 22 Apr 2015 14:44:00 +0300
-- Matthew Mosesohn <mmosesohn@mirantis.com> Wed, 22 Apr 2015 14:44:00 +0300
nailgun (6.0.0-1) trusty; urgency=low

2
fuel_agent/setup.cfg
View File

@ -1,6 +1,6 @@
[metadata]
name = fuel-agent
version = 6.1.0
version = 7.0.0
author = Mirantis
author-email = fuel-dev@lists.launchpad.net
summary = Fuel agent

2
fuel_agent_ci/setup.cfg
View File

@ -1,6 +1,6 @@
[metadata]
name = fuel-agent-ci
version = 6.1.0
version = 7.0.0
author = Mirantis
author-email = fuel-dev@lists.launchpad.net
summary = Fuel agent

2
fuelmenu/setup.py
View File

@ -18,7 +18,7 @@ import setuptools
setuptools.setup(
name="fuelmenu",
version='6.1.0',
version='7.0.0',
description="Console util for pre-configuration of Fuel server",
author="Matthew Mosesohn",
author_email="mmosesohn@mirantis.com",

1
nailgun/nailgun/errors/__init__.py
View File

@ -48,7 +48,6 @@ default_messages = {
"RedHatSetupError": "Red Hat setup error",
"TaskAlreadyRunning": "A task is already running",
"InvalidReleaseId": "Release Id is invalid",
"UnsupportedSerializer": "There are no serializers for a given cluster",
"InvalidOperatingSystem": "Invalid operating system",
"CannotFindPluginForRelease": "Cannot find plugin for the release",
"UnavailableRelease": "Release is unavailable",

14
nailgun/nailgun/fixtures/openstack.yaml
View File

@ -1173,7 +1173,7 @@
extend: *base_release
fields:
name: "Juno on CentOS 6.5"
version: "2014.2.2-6.1"
version: "2014.2.2-7.0"
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."
@ -1217,7 +1217,7 @@
priority: null
- type: "rpm"
name: "mos-updates"
uri: "http://mirror.fuel-infra.org/mos/centos-6/mos6.1/updates"
uri: "http://mirror.fuel-infra.org/mos/centos-6/mos7.0/updates"
priority: null
- type: "rpm"
name: "Auxiliary"
@ -1241,7 +1241,7 @@
extend: *base_release
fields:
name: "Juno on Ubuntu 14.04.1"
version: "2014.2.2-6.1"
version: "2014.2.2-7.0"
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."
@ -1285,25 +1285,25 @@
- type: "deb"
name: "mos"
uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/x86_64"
suite: "mos6.1"
suite: "mos7.0"
section: "main restricted"
priority: 1050
- type: "deb"
name: "mos-updates"
uri: "http://mirror.fuel-infra.org/mos/ubuntu/"
suite: "mos6.1-updates"
suite: "mos7.0-updates"
section: "main restricted"
priority: 1050
- type: "deb"
name: "mos-security"
uri: "http://mirror.fuel-infra.org/mos/ubuntu/"
suite: "mos6.1-security"
suite: "mos7.0-security"
section: "main restricted"
priority: 1050
- type: "deb"
name: "mos-holdback"
uri: "http://mirror.fuel-infra.org/mos/ubuntu/"
suite: "mos6.1-holdback"
suite: "mos7.0-holdback"
section: "main restricted"
priority: 1100
- type: "deb"

4
nailgun/nailgun/orchestrator/deployment_serializers.py
View File

@ -1844,7 +1844,9 @@ def get_serializer_for_cluster(cluster):
if env_version.startswith(version):
return serializers[env_mode]
raise errors.UnsupportedSerializer()
# return latest serializer by default
latest_version = sorted(six.iterkeys(serializers_map))[-1]
return serializers_map[latest_version][env_mode]
def serialize(orchestrator_graph, cluster, nodes, ignore_customized=False):

8
nailgun/nailgun/test/integration/test_attributes.py
View File

@ -411,7 +411,7 @@ class TestAlwaysEditable(BaseIntegrationTest):
super(TestAlwaysEditable, self).setUp()
self.env.create(
release_kwargs={
'version': '2014.2-6.1',
'version': '2014.2-7.0',
'operating_system': consts.RELEASE_OS.centos})
self.cluster = self.env.clusters[0]
@ -457,20 +457,20 @@ class TestAlwaysEditable(BaseIntegrationTest):
{
'type': 'rpm',
'name': 'mos',
'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/x86_64',
'uri': 'http://127.0.0.1:8080/2014.2-7.0/centos/x86_64',
'priority': None,
},
{
'type': 'rpm',
'name': 'mos-updates',
'uri': 'http://mirror.fuel-infra.org/mos/centos-6/mos6.1/'
'uri': 'http://mirror.fuel-infra.org/mos/centos-6/mos7.0/'
'updates',
'priority': None,
},
{
'type': 'rpm',
'name': 'Auxiliary',
'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/auxiliary',
'uri': 'http://127.0.0.1:8080/2014.2-7.0/centos/auxiliary',
'priority': 15,
},
])

10
nailgun/nailgun/test/unit/test_deployment_serializer.py
View File

@ -14,7 +14,6 @@
import mock
from nailgun.errors import errors
from nailgun.test.base import BaseUnitTest
from nailgun.orchestrator import deployment_serializers as ds
@ -68,7 +67,8 @@ class TestGetSerializer(BaseUnitTest):
'nailgun.orchestrator.deployment_serializers.utils.'
'extract_env_version',
return_value='9999.0')
def test_unsupported_serializer(self, _):
cluster = mock.MagicMock(is_ha_mode=True)
with self.assertRaises(errors.UnsupportedSerializer):
ds.get_serializer_for_cluster(cluster)
def test_usage_of_latest_serializer_in_case_of_new_release(self, _):
cluster = mock.MagicMock(is_ha_mode=False)
self.assertIs(
ds.get_serializer_for_cluster(cluster),
ds.DeploymentMultinodeSerializer61)

2
nailgun/setup.py
View File

@ -19,7 +19,7 @@ from setuptools import find_packages
from setuptools import setup
name = 'nailgun'
version = '6.1.0'
version = '7.0.0'
def find_requires():

2
network_checker/setup.py
View File

@ -17,7 +17,7 @@ import setuptools
setuptools.setup(
name="nailgun-net-check",
version='6.1.0',
version='7.0.0',
author="Mirantis Inc",
classifiers=[
"License :: OSI Approved :: Apache 2.0",

2
shotgun/setup.py
View File

@ -17,7 +17,7 @@ import setuptools
setuptools.setup(
name='shotgun',
version='6.1.0',
version='7.0.0',
description='Shotgun package',
long_description='Shotgun is diagnostic snapshot generator',
classifiers=[

2
specs/nailgun.spec
View File

@ -1,5 +1,5 @@
%define name nailgun
%{!?version: %define version 6.1.0}
%{!?version: %define version 7.0.0}
%{!?release: %define release 1}
Summary: Nailgun package

2
tasklib/setup.py
View File

@ -25,7 +25,7 @@ def requirements():
name = 'tasklib'
version = '6.1.0'
version = '7.0.0'
setuptools.setup(