openstack
/
fuel-web
Code Issues Proposed changes

Change openstack_version to liberty-9.0 in openstack.yaml 

Set release name to 'Liberty' in display name and description of new release.
Set openstack_version setting to 'liberty-9.0' to comply with the existing
versions schema.
Set opesntack_version to 'liberty-9.0' in tests.

Closes-bug: 1503663
Change-Id: Ifef952e18f08b98c430bbff9434984deaa68df81
This commit is contained in:
Oleg Gelbukh 2015-10-22 17:57:23 +00:00
parent c2bc55f655
commit 9c8cd9196d
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nailgun/nailgun/extensions/cluster_upgrade/tests/base.py
View File

@ -34,7 +34,7 @@ class BaseCloneClusterTest(nailgun_test_base.BaseIntegrationTest):
self.release_80 = self.env.create_release(
operating_system=consts.RELEASE_OS.ubuntu,
version="2015.1.0-8.0",
version="liberty-8.0",
)
self.cluster_61_db = self.env.create_cluster(

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

@ -1894,7 +1894,7 @@
fields:
name: "Liberty on CentOS 6.5"
state: "unavailable"
version: "2016.1.0-9.0"
version: "liberty-9.0"
can_update_from_versions: []
operating_system: "CentOS"
description: "This option will install the OpenStack Liberty packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
@ -1967,7 +1967,7 @@
extend: *base_release
fields:
name: "Liberty on Ubuntu 14.04"
version: "2016.1.0-9.0"
version: "liberty-9.0"
can_update_from_versions: []
operating_system: "Ubuntu"
description: "This option will install the OpenStack Liberty packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."

6
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': '2015.1.0-8.0',
'version': 'liberty-8.0',
'operating_system': consts.RELEASE_OS.centos})
self.cluster = self.env.clusters[0]
@ -457,7 +457,7 @@ class TestAlwaysEditable(BaseIntegrationTest):
{
'type': 'rpm',
'name': 'mos',
'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/x86_64',
'uri': 'http://127.0.0.1:8080/liberty-8.0/centos/x86_64',
'priority': None,
},
{
@ -477,7 +477,7 @@ class TestAlwaysEditable(BaseIntegrationTest):
{
'type': 'rpm',
'name': 'Auxiliary',
'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/auxiliary',
'uri': 'http://127.0.0.1:8080/liberty-8.0/centos/auxiliary',
'priority': 15,
},
])

2
nailgun/nailgun/test/integration/test_orchestrator_serializer.py
View File

@ -1917,7 +1917,7 @@ class TestNeutronOrchestratorSerializer(OrchestratorSerializerTestBase):
'private' in (fact['network_scheme']['roles']), False)
def test_tun_segmentation(self):
self.new_env_release_version = '2015.1.0-8.0'
self.new_env_release_version = 'liberty-8.0'
cluster = self.create_env(consts.CLUSTER_MODES.ha_compact, 'tun')
facts = self.serializer.serialize(cluster, cluster.nodes)

10
nailgun/nailgun/test/integration/test_orchestrator_serializer_80.py
View File

@ -41,7 +41,7 @@ from nailgun.test.integration.test_orchestrator_serializer_70 import \
class TestSerializer80Mixin(object):
env_version = "2015.1.0-8.0"
env_version = "liberty-8.0"
def _check_baremetal_neutron_attrs(self, cluster):
self.env._set_additional_component(cluster, 'ironic', True)
@ -70,7 +70,7 @@ class TestNetworkTemplateSerializer80(
TestSerializer80Mixin,
BaseDeploymentSerializer
):
env_version = '2015.1.0-8.0'
env_version = 'liberty-8.0'
def setUp(self, *args):
super(TestNetworkTemplateSerializer80, self).setUp()
@ -186,7 +186,7 @@ class TestDeploymentAttributesSerialization80(
TestSerializer80Mixin,
BaseDeploymentSerializer
):
env_version = '2015.1.0-8.0'
env_version = 'liberty-8.0'
def setUp(self):
super(TestDeploymentAttributesSerialization80, self).setUp()
@ -380,7 +380,7 @@ class TestDeploymentAttributesSerialization80(
class TestMultiNodeGroupsSerialization80(BaseDeploymentSerializer):
env_version = '2015.1.0-8.0'
env_version = 'liberty-8.0'
def setUp(self):
super(TestMultiNodeGroupsSerialization80, self).setUp()
@ -456,7 +456,7 @@ class TestMultiNodeGroupsSerialization80(BaseDeploymentSerializer):
class TestBlockDeviceDevicesSerialization80(BaseDeploymentSerializer):
env_version = '2015.1.0-8.0'
env_version = 'liberty-8.0'
def setUp(self):
super(TestBlockDeviceDevicesSerialization80, self).setUp()

2
nailgun/nailgun/test/integration/test_verify_networks_task_manager.py
View File

@ -474,7 +474,7 @@ class TestNetworkVerificationWithTemplates(BaseIntegrationTest):
{"name": "eth3", "mac": "00:00:00:00:22:99"}]
)
self.cluster = self.env.create(
release_kwargs={'version': '2015.1.0-8.0'},
release_kwargs={'version': 'liberty-8.0'},
cluster_kwargs={
'net_provider': consts.CLUSTER_NET_PROVIDERS.neutron,
'net_segment_type': net_type,

2
nailgun/nailgun/test/unit/test_network_check.py
View File

@ -712,7 +712,7 @@ class TestCheckVIPsNames(BaseIntegrationTest):
super(TestCheckVIPsNames, self).setUp()
self.env.create(
release_kwargs={'version': '2015.1.0-8.0'},
release_kwargs={'version': 'liberty-8.0'},
cluster_kwargs={
'net_provider': consts.CLUSTER_NET_PROVIDERS.neutron,
'net_segment_type': consts.NEUTRON_SEGMENT_TYPES.gre,

2
nailgun/nailgun/test/unit/test_objects.py
View File

@ -207,7 +207,7 @@ class TestNodeObject(BaseIntegrationTest):
nodes_kwargs=[{'role': 'controller'}] * 3)
new_cluster = self.env.create(
cluster_kwargs={'api': False},
release_kwargs={'version': '2015.1.0-8.0'},
release_kwargs={'version': 'liberty-8.0'},
)
net_template = self.env.read_fixtures(['network_template_80'])[0]