From be453a2c642b2cc15bc7c82f931770fb242ea60f Mon Sep 17 00:00:00 2001 From: Sergey Kulanov Date: Mon, 21 Mar 2016 12:45:09 +0200 Subject: [PATCH] Bump version to 10.0 Change-Id: Ie2ed9798aa6fdfbdfcb4f7de6add6f46911878fd Related-bug: #1558589 --- debian/changelog | 6 +++++ nailgun/nailgun/fixtures/openstack.yaml | 36 ++++++++++++------------- nailgun/nailgun/settings.yaml | 2 +- nailgun/setup.py | 2 +- specs/fuel-nailgun.spec | 2 +- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index fecb45e047..3b1a36d1be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fuel-nailgun (10.0.0-1) trusty; urgency=low + + * Bump version to 10.0 + + -- Sergey Kulanov Mon, 21 Mar 2016 12:36:45 +0200 + fuel-nailgun (9.0.0-1) trusty; urgency=low * Bump version to 9.0 diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml index 96f0c19f90..411b8aeabf 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -1887,9 +1887,9 @@ - pk: 1 extend: *base_release fields: - name: "Mitaka on CentOS 6.5" + name: "Newton on CentOS 6.5" state: "unavailable" - version: "mitaka-9.0" + version: "newton-10.0" operating_system: "CentOS" description: "This option will install the OpenStack Mitaka packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." attributes_metadata: @@ -1925,7 +1925,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-9.0/reference-architecture.html#fuel-rep-mirror). + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-10.0/reference-architecture.html#fuel-rep-mirror). value: - type: "rpm" name: "mos" @@ -1962,8 +1962,8 @@ pk: 2 extend: *base_release fields: - name: "Mitaka on Ubuntu 14.04" - version: "mitaka-9.0" + name: "Newton on Ubuntu 14.04" + version: "newton-10.0" operating_system: "Ubuntu" description: "This option will install the OpenStack Mitaka 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: @@ -1984,7 +1984,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-9.0/operations.html#external-ubuntu-ops). + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-10.0/operations.html#external-ubuntu-ops). value: - type: "deb" name: "ubuntu" @@ -2007,25 +2007,25 @@ - type: "deb" name: "mos" uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/x86_64" - suite: "mos9.0" + suite: "mos10.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: "mos9.0-updates" + suite: "mos10.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: "mos9.0-security" + suite: "mos10.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: "mos9.0-holdback" + suite: "mos10.0-holdback" section: "main restricted" priority: 1100 - type: "deb" @@ -2203,9 +2203,9 @@ - pk: 3 extend: *ubuntu_release fields: - name: "Mitaka on Ubuntu+UCA 14.04" - version: "mitaka-9.0" - description: "This option will install the OpenStack Mitaka packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." + name: "Newton on Ubuntu+UCA 14.04" + version: "newton-10.0" + description: "This option will install the OpenStack Newton packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." attributes_metadata: editable: repo_setup: @@ -2216,7 +2216,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-9.0/operations.html#external-ubuntu-ops). + For more details, please refer to the documentation (https://docs.mirantis.com/openstack/fuel/fuel-10.0/operations.html#external-ubuntu-ops). value: - type: "deb" name: "ubuntu" @@ -2251,25 +2251,25 @@ - type: "deb" name: "mos" uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/x86_64" - suite: "mos9.0" + suite: "mos10.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: "mos9.0-updates" + suite: "mos10.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: "mos9.0-security" + suite: "mos10.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: "mos9.0-holdback" + suite: "mos10.0-holdback" section: "main restricted" priority: 1100 - type: "deb" diff --git a/nailgun/nailgun/settings.yaml b/nailgun/nailgun/settings.yaml index 664a98df89..304abbd8da 100644 --- a/nailgun/nailgun/settings.yaml +++ b/nailgun/nailgun/settings.yaml @@ -19,7 +19,7 @@ AUTH: VERSION: # this value is still here for backward compatibility - release: "9.0" + release: "10.0" API: "1" diff --git a/nailgun/setup.py b/nailgun/setup.py index c7180893a2..a9b5464687 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 = '9.0.0' +version = '10.0.0' def find_requires(): diff --git a/specs/fuel-nailgun.spec b/specs/fuel-nailgun.spec index a78dc6b916..b7843489f9 100644 --- a/specs/fuel-nailgun.spec +++ b/specs/fuel-nailgun.spec @@ -1,5 +1,5 @@ %define name fuel-nailgun -%{!?version: %define version 9.0.0} +%{!?version: %define version 10.0.0} %{!?release: %define release 1} Summary: Nailgun package