openstack
/
fuel-web
Code Issues Proposed changes

Change version to 8.0 

Change-Id: I0f4479df325a401ac782b5647ad811606490daf9
This commit is contained in:
Vladimir Kozhukalov 2015-09-03 11:15:05 +03:00
parent 0dfcf73deb
commit 3aced340bd
11 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,9 @@
nailgun (8.0.0-1) trusty; urgency=low
* Change version to 8.0.0
-- Vladimir Kozhukalov <vkozhukalov@mirantis.com> Mon, 03 Sep 2015 11:12:00 +0300
nailgun (7.0.0-1) trusty; urgency=low
* Update version to 7.0.0
@ -24,6 +30,6 @@ nailgun (0.1.0-ubuntu1) precise; urgency=low
nailgun (0.1.0-1ubuntu0) precise; urgency=low
* Add fencing agent script as a separated task
* Add fencing agent script as a separated task
-- Bogdan Dobrelya <bdobrelia@mirantis.com> Thu, 23 Jan 2014 18:55:00 +0400

2
fuel_upgrade_system/fuel_package_updates/fuel_package_updates/fuel_package_updates.py
View File

@ -68,7 +68,7 @@ KEYSTONE_CREDS = {'username': os.environ.get('KEYSTONE_USERNAME', 'admin'),
'tenant_name': os.environ.get('KEYSTONE_TENANT', 'admin')}
# TODO(mattymo): parse from Fuel API
FUEL_VER = "7.0"
FUEL_VER = "8.0"
UBUNTU_CODENAME = 'trusty'
CENTOS_VERSION = 'centos-6'

2
fuel_upgrade_system/fuel_package_updates/setup.py
View File

@ -29,7 +29,7 @@ def find_requires():
if __name__ == "__main__":
setup(name='fuel_package_updates',
version='6.0.0',
version='8.0.0',
description='Package update downloader for Fuel Master node',
long_description='Package Update downloader for Fuel Master node',
classifiers=[

2
fuelmenu/setup.py
View File

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

33
nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_8_0.py Normal file
View File

@ -0,0 +1,33 @@
# Copyright 2015 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""empty message
Revision ID: 43b2cb64dae6
Revises: 1e50a4903910
Create Date: 2015-09-03 12:28:11.132934
"""
# revision identifiers, used by Alembic.
revision = '43b2cb64dae6'
down_revision = '1e50a4903910'
def upgrade():
pass
def downgrade():
pass

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

@ -1479,7 +1479,7 @@
fields:
name: "Kilo on CentOS 6.5"
state: "unavailable"
version: "2015.1.0-7.0"
version: "2015.1.0-8.0"
is_deployable: false
can_update_from_versions: []
operating_system: "CentOS"
@ -1516,7 +1516,7 @@
description: |
To create a local repository mirror on the Fuel master node, please follow the instructions provided by running "fuel-package-updates --help" on the Fuel master node.
Please make sure your Fuel master node has Internet access to the repository before attempting to create a mirror.
For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/reference-architecture.html#fuel-rep-mirror).
For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-8.0/reference-architecture.html#fuel-rep-mirror).
value:
- type: "rpm"
name: "mos"
@ -1552,7 +1552,7 @@
extend: *base_release
fields:
name: "Kilo on Ubuntu 14.04.1"
version: "2015.1.0-7.0"
version: "2015.1.0-8.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."
@ -1573,7 +1573,7 @@
Please note: the first repository will be considered the operating system mirror that will be used during node provisioning.
To create a local repository mirror on the Fuel master node, please follow the instructions provided by running "fuel-createmirror --help" on the Fuel master node.
Please make sure your Fuel master node has Internet access to the repository before attempting to create a mirror.
For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#external-ubuntu-ops).
For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-8.0/operations.html#external-ubuntu-ops).
value:
- type: "deb"
name: "ubuntu"
@ -1596,25 +1596,25 @@
- type: "deb"
name: "mos"
uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/x86_64"
suite: "mos7.0"
suite: "mos8.0"
section: "main restricted"
priority: 1050
- type: "deb"
name: "mos-updates"
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/{cluster.release.environment_version}/"
suite: "mos7.0-updates"
suite: "mos8.0-updates"
section: "main restricted"
priority: 1050
- type: "deb"
name: "mos-security"
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/{cluster.release.environment_version}/"
suite: "mos7.0-security"
suite: "mos8.0-security"
section: "main restricted"
priority: 1050
- type: "deb"
name: "mos-holdback"
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/{cluster.release.environment_version}/"
suite: "mos7.0-holdback"
suite: "mos8.0-holdback"
section: "main restricted"
priority: 1100
- type: "deb"

10
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': '2015.1.0-7.0',
'version': '2015.1.0-8.0',
'operating_system': consts.RELEASE_OS.centos})
self.cluster = self.env.clusters[0]
@ -490,27 +490,27 @@ class TestAlwaysEditable(BaseIntegrationTest):
{
'type': 'rpm',
'name': 'mos',
'uri': 'http://127.0.0.1:8080/2015.1.0-7.0/centos/x86_64',
'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/x86_64',
'priority': None,
},
{
'type': 'rpm',
'name': 'mos-updates',
'uri': 'http://mirror.fuel-infra.org/mos-repos/centos/'
'mos7.0-centos6/updates/x86_64',
'mos8.0-centos6/updates/x86_64',
'priority': None,
},
{
'type': 'rpm',
'name': 'mos-security',
'uri': 'http://mirror.fuel-infra.org/mos-repos/centos/'
'mos7.0-centos6/security/x86_64',
'mos8.0-centos6/security/x86_64',
'priority': None,
},
{
'type': 'rpm',
'name': 'Auxiliary',
'uri': 'http://127.0.0.1:8080/2015.1.0-7.0/centos/auxiliary',
'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/auxiliary',
'priority': 15,
},
])

2
nailgun/setup.py
View File

@ -19,7 +19,7 @@ from setuptools import find_packages
from setuptools import setup
name = 'nailgun'
version = '7.0.0'
version = '8.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='7.0.0',
version='8.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='7.0.0',
version='8.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 7.0.0}
%{!?version: %define version 8.0.0}
%{!?release: %define release 1}
Summary: Nailgun package