openstack
/
fuel-web
Code Issues Proposed changes

Merge "Revert "Change release version to Liberty in openstack.yaml""

This commit is contained in:
Jenkins 2015-10-19 18:03:16 +00:00 committed by Gerrit Code Review
parent c2be415016 ecd348b002
commit 2e948eaa01
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1521,13 +1521,13 @@
- pk: 1
extend: *base_release
fields:
name: "Liberty on CentOS 6.5"
name: "Kilo on CentOS 6.5"
state: "unavailable"
version: "liberty-8.0"
version: "2015.1.0-8.0"
is_deployable: false
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."
description: "This option will install the OpenStack Kilo packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
attributes_metadata:
editable:
kernel_params:
@ -1595,11 +1595,11 @@
- pk: 2
extend: *base_release
fields:
name: "Liberty on Ubuntu 14.04"
version: "liberty-8.0"
name: "Kilo on Ubuntu 14.04"
version: "2015.1.0-8.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."
description: "This option will install the OpenStack Kilo packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment."
attributes_metadata:
editable:
kernel_params:

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

@ -444,7 +444,7 @@ class TestAlwaysEditable(BaseIntegrationTest):
super(TestAlwaysEditable, self).setUp()
self.env.create(
release_kwargs={
'version': 'liberty-8.0',
'version': '2015.1.0-8.0',
'operating_system': consts.RELEASE_OS.centos})
self.cluster = self.env.clusters[0]
@ -490,7 +490,7 @@ class TestAlwaysEditable(BaseIntegrationTest):
{
'type': 'rpm',
'name': 'mos',
'uri': 'http://127.0.0.1:8080/liberty-8.0/centos/x86_64',
'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/x86_64',
'priority': None,
},
{
@ -510,7 +510,7 @@ class TestAlwaysEditable(BaseIntegrationTest):
{
'type': 'rpm',
'name': 'Auxiliary',
'uri': 'http://127.0.0.1:8080/liberty-8.0/centos/auxiliary',
'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/auxiliary',
'priority': 15,
},
])